gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove bower and port dependencies over to npm

Browse Source
This commit is contained in:
Petr Gazarov
2016-11-06 21:45:09 -05:00
parent 79a7677093
commit f159027025
15 changed files with 49 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.bowerrc
View File

@ -1,3 +0,0 @@
{
"directory" : "public/bower_components"
}

6
CONTRIBUTING.md
View File

@ -172,12 +172,6 @@ npm install
# Install Gulp globally
npm install -g gulp
# Install Bower globally
npm install -g bower
# Install Bower dependencies
bower install
```
Then you need to add the private environment variables (API Keys):

33
bower.json
View File

@ -1,33 +0,0 @@
{
"name": "freecodecamp",
"version": "0.0.0",
"homepage": "http://freecodecamp.com",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"public/bower_components",
"test",
"tests"
],
"dependencies": {
"d3": "~3.5.5",
"jquery": "~3.1.1",
"cal-heatmap": "~3.5.2",
"bootstrap": "~3.3.4",
"font-awesome": "~4.5.0",
"moment": "~2.10.2",
"moment-timezone": "~0.5.0",
"jshint": "~2.9.0",
"lightbox2": "~2.8.1",
"rxjs": "~4.0.6",
"CodeMirror": "~5.15.2",
"chai": "~3.4.1",
"clipboard": "~1.5.5",
"mousetrap": "~1.5.3"
},
"resolutions": {
"jquery": "~3.1.1"
}
}

2
client/less/lib/bootstrap/variables.less
View File

@ -76,7 +76,7 @@
//== Iconography
//
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via npm.
//** Load fonts from this directory.
@icon-font-path: "../fonts/";

45
gulpfile.js
View File

@ -88,34 +88,33 @@ var paths = {
},
vendorChallenges: [
'public/bower_components/jshint/dist/jshint.js',
'public/bower_components/chai/chai.js',
'public/bower_components/CodeMirror/lib/codemirror.js',
'public/bower_components/CodeMirror/addon/comment/comment.js',
'public/bower_components/CodeMirror/addon/edit/closebrackets.js',
'public/bower_components/CodeMirror/addon/edit/matchbrackets.js',
'public/bower_components/CodeMirror/addon/lint/lint.js',
'public/bower_components/CodeMirror/addon/lint/javascript-lint.js',
'public/bower_components/CodeMirror/mode/javascript/javascript.js',
'public/bower_components/CodeMirror/mode/xml/xml.js',
'public/bower_components/CodeMirror/mode/css/css.js',
'public/bower_components/CodeMirror/mode/htmlmixed/htmlmixed.js',
'node_modules/emmet-codemirror/dist/emmet.js',
require.resolve('jshint').replace('src', 'dist'),
require.resolve('chai').replace('index.js', 'chai.js'),
require.resolve('codemirror'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/comment/comment.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/edit/closebrackets.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/edit/matchbrackets.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/lint/lint.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'addon/lint/javascript-lint.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/javascript/javascript.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/xml/xml.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/css/css.js'),
require.resolve('codemirror').replace('lib/codemirror.js', 'mode/htmlmixed/htmlmixed.js'),
require.resolve('emmet-codemirror'),
'public/js/lib/loop-protect/loop-protect.js'
],
vendorMain: [
'public/bower_components/jquery/dist/jquery.min.js',
'public/bower_components/bootstrap/dist/js/bootstrap.min.js',
'public/bower_components/d3/d3.min.js',
'public/bower_components/moment/min/moment.min.js',
require.resolve('jquery').replace('.js', '.min.js'),
require.resolve('bootstrap').replace('npm.js', 'bootstrap.min.js'),
require.resolve('d3').replace('.js', '.min.js'),
require.resolve('cal-heatmap'),
require.resolve('moment').replace('.js', '.min.js'),
require.resolve('moment-timezone').replace('index.js', 'builds/moment-timezone-with-data.min.js'),
'public/bower_components/' +
'moment-timezone/builds/moment-timezone-with-data.min.js',
'public/bower_components/mousetrap/mousetrap.min.js',
'public/bower_components/lightbox2/dist/js/lightbox.min.js',
'public/bower_components/rxjs/dist/rx.all.min.js'
require.resolve('mousetrap').replace('.js', '.min.js'),
require.resolve('lightbox2').replace('.js', '.min.js'),
require.resolve('rx').replace('index.js', 'dist/rx.all.min.js')
],
js: [

16
package.json
View File

@ -7,7 +7,7 @@
"create-rev": "node -e \"var fs = require('fs'); fs.access('./server/rev-manifest.json', function(err) { if (err) { console.log('\\n\\ncreating manifest\\n\\n'); return fs.writeFileSync('server/rev-manifest.json', '{}'); } console.log('\\n\\nrev-manifest present\\n\\n'); });\"",
"build": "NODE_ENV=production gulp build -p",
"start": "babel-node server/server.js",
"prestart-production": "bower cache clean && bower install && gulp build -p",
"prestart-production": "gulp build -p",
"start-production": "node pm2Start",
"lint": "npm run lint-js && npm run lint-json",
"lint-challenges": "jsonlint-cli seed/challenges/**/*.json",
@ -37,11 +37,17 @@
"babel-preset-react": "^6.3.13",
"babel-register": "^6.3.0",
"body-parser": "^1.13.2",
"bootstrap": "~3.3.7",
"cal-heatmap": "~3.5.2",
"chai": "~3.4.1",
"classnames": "^2.1.2",
"clipboard": "~1.5.15",
"codemirror": "~5.15.2",
"compression": "^1.6.0",
"connect-mongo": "^1.3.2",
"cookie-parser": "^1.4.0",
"csurf": "^1.8.3",
"d3": "~3.5.17",
"debug": "^2.2.0",
"dedent": "~0.6.0",
"dotenv": "^4.0.0",
@ -54,6 +60,7 @@
"express-state": "^1.2.0",
"express-validator": "^3.0.0",
"fetchr": "~0.5.12",
"font-awesome": "~4.5.0",
"frameguard": "^3.0.0",
"gitter-sidecar": "^1.2.3",
"googleapis": "16.1.0",
@ -62,7 +69,10 @@
"history": "^3.2.1",
"invariant": "^2.2.1",
"jade": "^1.11.0",
"jquery": "~3.1.1",
"jshint": "~2.9.4",
"jsonlint-cli": "^1.0.1",
"lightbox2": "~2.8.2",
"lodash": "^4.1.0",
"loopback": "^2.22.0",
"loopback-boot": "^2.13.0",
@ -73,7 +83,7 @@
"moment-timezone": "^0.5.0",
"mongodb": "^2.0.33",
"morgan": "^1.6.1",
"mousetrap": "^1.6.0",
"mousetrap": "~1.6.0",
"node-emoji": "^1.4.1",
"nodemailer": "^2.1.0",
"nodemailer-ses-transport": "^1.3.0",
@ -113,7 +123,7 @@
"redux-form": "^5.2.3",
"request": "^2.65.0",
"reselect": "^2.0.2",
"rx": "^4.0.0",
"rx": "~4.0.8",
"sanitize-html": "^1.11.1",
"snyk": "^1.19.1",
"store": "https://github.com/berkeleytrue/store.js.git#feature/noop-server",

4
public/css/themes/flatly.less
View File

@ -72,7 +72,7 @@
//== Iconography
//
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via npm.
//** Load fonts from this directory.
@icon-font-path: "../fonts/";
@ -1164,4 +1164,4 @@ a.list-group-item {
.popover {
color: @text-color;
}
}

1
server/middlewares/add-return-to.js
View File

@ -1,6 +1,5 @@
const pathsOfNoReturn = [
'link',
'bower_components',
'auth',
'login',
'logout',

1
server/views/account/show.jade
View File

@ -1,7 +1,6 @@
extends ../layout
block content
include ../partials/flyer
script(src="/bower_components/cal-heatmap/cal-heatmap.min.js")
script.
var challengeName = 'Profile View';
if (user && user.username === username)

2
server/views/certificate/back-end.jade
View File

@ -1,5 +1,5 @@
meta(name='viewport', content='width=device-width, initial-scale=1')
link(rel='stylesheet', href='/bower_components/bootstrap/dist/css/bootstrap.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css')
include styles
.certificate-wrapper.container

2
server/views/certificate/data-vis.jade
View File

@ -1,5 +1,5 @@
meta(name='viewport', content='width=device-width, initial-scale=1')
link(rel='stylesheet', href='/bower_components/bootstrap/dist/css/bootstrap.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css')
include styles
.certificate-wrapper.container

2
server/views/certificate/front-end.jade
View File

@ -1,5 +1,5 @@
meta(name='viewport', content='width=device-width, initial-scale=1')
link(rel='stylesheet', href='/bower_components/bootstrap/dist/css/bootstrap.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css')
include styles
.certificate-wrapper.container

2
server/views/certificate/full-stack.jade
View File

@ -1,5 +1,5 @@
meta(name='viewport', content='width=device-width, initial-scale=1')
link(rel='stylesheet', href='/bower_components/bootstrap/dist/css/bootstrap.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css')
include styles
.certificate-wrapper.container

8
server/views/partials/react-stylesheets.jade
View File

@ -1,9 +1,9 @@
link(rel='stylesheet', type='text/css' href='/css/lato.css')
link(rel='stylesheet', type='text/css' href='/css/ubuntu.css')
link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css')
link(rel='stylesheet', href='/bower_components/CodeMirror/lib/codemirror.css')
link(rel='stylesheet', href='/bower_components/CodeMirror/addon/lint/lint.css')
link(rel='stylesheet', href='/bower_components/CodeMirror/theme/monokai.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.15.2/codemirror.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.15.2/addon/lint/lint.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.15.2/theme/monokai.min.css')
link(rel='stylesheet', href=rev('/css', 'main.css'))
include meta

6
server/views/partials/stylesheets.jade
View File

@ -1,5 +1,5 @@
link(rel='stylesheet', type='text/css' href='/css/lato.css')
link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css")
link(rel='stylesheet', href='/bower_components/font-awesome/css/font-awesome.min.css')
link(rel='stylesheet', href='/bower_components/lightbox2/dist/css/lightbox.css')
link(rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/cal-heatmap/3.5.2/cal-heatmap.css")
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css')
link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/lightbox2/2.8.2/css/lightbox.min.css')
link(rel='stylesheet', href=rev('/css', 'main.css'))