Skip to content

Commit 2bd67f7

Browse files
committed
Remove bower, now that we know how to build without it.
WOW.js is the only broken dependency, and mattdelacdev/WOW#236 should fix it. (Integrating with bower only-partiailly was a bad idea, since it meant we had two versions of jquery bouncing around, one in bower, one in npm, and sometimes modules might operate on different ones.)
1 parent 47f47db commit 2bd67f7

File tree

8 files changed

+17
-71
lines changed

8 files changed

+17
-71
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
assets
22
scratch
3-
bower_components
43
download
54
local_data
65
local_data2

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,4 @@ scratch
2828

2929
# installed libraries
3030
lib/
31-
bower_components/
3231
node_modules/

app.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ skip_files:
148148
- ^local_data2(/.*)?
149149
- ^local_data3(/.*)?
150150
- ^assets(/.*)?
151-
- ^bower_components(/.*)?
152151
- ^download(/.*)?
153152
- ^node_modules(/.*)?
154153
- ^snapshotted(/.*)?

bower.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

dancedeets.sublime-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"follow_symlinks": true,
66
"path": ".",
7-
"folder_exclude_patterns": ["download", "build", "node_modules", "bower_components"],
7+
"folder_exclude_patterns": ["download", "build", "node_modules"],
88
},
99
],
1010
"build_systems":

gulpfile.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var browserify = require('browserify');
22
var buffer = require('vinyl-buffer');
33
var concat = require('gulp-concat');
44
var cssnano = require('gulp-cssnano');
5-
var debowerify = require("debowerify");
65
var del = require('del');
76
var gulp = require('gulp');
87
var gulpif = require('gulp-if');
@@ -45,9 +44,9 @@ var config = {
4544
},
4645
css: {
4746
sourceFiles: [
48-
"bower_components/font-awesome/css/font-awesome.css",
49-
"bower_components/bootstrap/dist/css/bootstrap.css",
50-
"bower_components/animate.css/animate.css",
47+
"node_modules/font-awesome/css/font-awesome.css",
48+
"node_modules/bootstrap/dist/css/bootstrap.css",
49+
"node_modules/animate.css/animate.css",
5150
"assets/css/app.css",
5251
"assets/css/style.css",
5352
"assets/css/headers/header-v6.css",
@@ -117,8 +116,6 @@ function compileJavascript(watch) {
117116
// Output build logs to terminal
118117
b.on('log', gutil.log);
119118

120-
// Allow us to use raw Bower modules
121-
b.transform(debowerify);
122119
// Convert JSX, if we see it
123120
b.transform(reactify);
124121

main.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
require('jquery')
2-
require('jquery-backstretch-2')
3-
4-
require('bootstrap')
5-
var WOW = require('wow')
6-
var App = require('./assets/js/app')
1+
global.jQuery = global.$ = require('jquery');
2+
require('jquery.backstretch');
3+
require('bootstrap');
4+
var WOW = require('wow.js');
5+
var App = require('./assets/js/app');
76

87
//from old site: jquery.cookie@1.4.1,momentjs@2.10.6,jquery.lazyload@1.9.3
98

package.json

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"description": "DanceDeets Build rules",
55
"devDependencies": {
66
"browserify": "^13.0.0",
7-
"concurrent-transform": "^1.0.0",
8-
"debowerify": "^1.3.1",
97
"del": "^2.2.0",
108
"gulp": "^3.9.0",
119
"gulp-cssnano": "^2.1.0",
@@ -16,29 +14,18 @@
1614
"gulp-uglify": "^1.5.1",
1715
"gulp-uncss": "^1.0.4",
1816
"gutil": "^1.6.4",
19-
"html5shiv": "^3.7.3",
20-
"jquery.placeholder": "^2.0.7",
2117
"lodash": "^4.1.0",
22-
"respond.js": "^1.4.2",
2318
"run-sequence": "^1.1.5",
2419
"vinyl-transform": "^1.0.0",
2520
"watchify": "^3.7.0"
2621
},
2722
"dependencies": {
28-
"respimage": "^1.4.2"
29-
},
30-
"style": [
31-
"assets/css/style.css",
32-
"assets/css/ie8.css",
33-
"assets/css/blocks.css",
34-
"assets/css/plugins.css",
35-
"assets/css/app.css",
36-
"assets/css/one-theme.css",
37-
"assets/css/headers/header-v6.css",
38-
"assets/css/footers/footer-v2.css",
39-
"assets/css/theme-colors/default.css",
40-
"assets/css/theme-skins/dark.css",
41-
"bower_components/font-awesome/css/font-awesome.css",
42-
"assets/css/custom.css"
43-
]
23+
"bootstrap": "^3.3.6",
24+
"html5shiv": "^3.7.3",
25+
"jquery": "^2.2.0",
26+
"jquery.backstretch": "^2.1.1",
27+
"jquery.placeholder": "^2.0.7",
28+
"respond.js": "^1.4.2",
29+
"wow.js": "^1.1.2"
30+
}
4431
}

0 commit comments

Comments
 (0)