WEBDIENSTE/YellowLabTools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97 from gmetais/browserify

Browse Source 
Remove Bower and update dependencies
This commit is contained in:
Gaël Métais
2015-08-16 13:36:43 +02:00
parent 2c2c8bf4cb 2f1003e8bc
commit 83cf87c8cf
8 changed files with 54 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.bowerrc
-3
View File
@@ -1,3 +0,0 @@
{
"directory" : "bower_components"
}
.gitignore
-1
View File
@@ -1,5 +1,4 @@
node_modules
bower_components
.tmp
.vagrant
results/*
bower.json
-13
View File
@@ -1,13 +0,0 @@
{
"name": "yellowlabtools",
"dependencies": {
"angular": "1.3.15",
"angular-route": "1.3.15",
"angular-resource": "1.3.15",
"angular-sanitize": "1.3.15",
"angular-animate": "1.3.15",
"angular-local-storage": "0.2.2",
"angular-chart.js": "0.7.1",
"Chart.js": "~1.0.2"
}
}
front/src/main.html
+9 -9
View File
@@ -16,18 +16,18 @@
<link rel="stylesheet" type="text/css" href="/css/screenshot.css">
<link rel="stylesheet" type="text/css" href="/css/timeline.css">
<link rel="stylesheet" type="text/css" href="/css/about.css">
<link rel="stylesheet" type="text/css" href="/bower_components/angular-chart.js/dist/angular-chart.css">
<link rel="stylesheet" type="text/css" href="/node_modules/angular-chart.js/dist/angular-chart.css">
<!-- endbuild -->
<!-- build:js /js/all.js -->
<script src="/bower_components/angular/angular.min.js"></script>
<script src="/bower_components/Chart.js/Chart.min.js"></script>
<script src="/bower_components/angular-route/angular-route.min.js"></script>
<script src="/bower_components/angular-resource/angular-resource.min.js"></script>
<script src="/bower_components/angular-sanitize/angular-sanitize.min.js"></script>
<script src="/bower_components/angular-animate/angular-animate.min.js"></script>
<script src="/bower_components/angular-local-storage/dist/angular-local-storage.min.js"></script>
<script src="/bower_components/angular-chart.js/dist/angular-chart.min.js"></script>
<script src="/node_modules/angular/angular.min.js"></script>
<script src="/node_modules/chart.js/Chart.min.js"></script>
<script src="/node_modules/angular-route/angular-route.min.js"></script>
<script src="/node_modules/angular-resource/angular-resource.min.js"></script>
<script src="/node_modules/angular-sanitize/angular-sanitize.min.js"></script>
<script src="/node_modules/angular-animate/angular-animate.min.js"></script>
<script src="/node_modules/angular-local-storage/dist/angular-local-storage.min.js"></script>
<script src="/node_modules/angular-chart.js/dist/angular-chart.min.js"></script>
<script src="/js/app.js"></script>
<script src="/js/controllers/indexCtrl.js"></script>
<script src="/js/controllers/dashboardCtrl.js"></script>
lib/server/controllers/frontController.js
+1 -1
View File
@@ -20,7 +20,7 @@ var FrontController = function(app) {
app.use('/img', express.static(path.join(__dirname, assetsPath, 'img'), { maxAge: cacheDuration }));
app.use('/js', express.static(path.join(__dirname, assetsPath, 'js'), { maxAge: cacheDuration }));
app.use('/views', express.static(path.join(__dirname, assetsPath, 'views'), { maxAge: cacheDuration }));
app.use('/bower_components', express.static(path.join(__dirname, '../../../bower_components'), { maxAge: cacheDuration }));
app.use('/node_modules', express.static(path.join(__dirname, '../../../node_modules'), { maxAge: cacheDuration }));
};
module.exports = FrontController;
package.json
+42 -34
View File
@@ -2,7 +2,7 @@
"name": "yellowlabtools",
"version": "1.7.4",
"description": "Online tool to audit a webpage for performance and front-end quality issues",
"license" : "GPL-2.0",
"license": "GPL-2.0",
"author": {
"name": "Gaël Métais",
"email": "gael@gaelmetais.com",
@@ -17,51 +17,59 @@
},
"main": "./lib/index.js",
"dependencies": {
"async": "1.2.1",
"body-parser": "1.13.1",
"clean-css": "3.3.0",
"compression": "1.5.0",
"angular": "1.4.4",
"angular-animate": "1.4.4",
"angular-chart.js": "0.7.3",
"angular-local-storage": "0.2.2",
"angular-resource": "1.4.4",
"angular-route": "1.4.4",
"angular-sanitize": "1.4.4",
"async": "1.4.2",
"body-parser": "1.13.3",
"chart.js": "1.0.2",
"clean-css": "3.3.9",
"compression": "1.5.2",
"cors": "2.7.1",
"debug": "2.2.0",
"express": "4.12.4",
"express": "4.13.3",
"imagemin": "3.2.0",
"imagemin-jpegoptim": "4.0.0",
"lwip": "0.0.7",
"meow": "3.3.0",
"minimize": "1.4.1",
"minimize": "1.6.0",
"phantomas": "1.11.0",
"ps-node": "0.0.4",
"q": "1.4.1",
"request": "^2.58.0",
"rimraf": "2.4.0",
"request": "2.60.0",
"rimraf": "2.4.2",
"temporary": "0.0.8",
"uglify-js": "2.4.23"
"uglify-js": "2.4.24"
},
"devDependencies": {
"chai": "^3.0.0",
"grunt": "^0.4.5",
"grunt-blanket": "^0.0.8",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-cssmin": "^0.12.3",
"grunt-contrib-htmlmin": "^0.4.0",
"grunt-contrib-jshint": "^0.11.2",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-uglify": "^0.9.1",
"grunt-env": "^0.4.4",
"grunt-express": "^1.4.1",
"grunt-filerev": "^2.3.1",
"grunt-inline-angular-templates": "^0.1.5",
"grunt-line-remover": "^0.0.2",
"grunt-mocha-test": "^0.12.7",
"grunt-replace": "^0.9.2",
"grunt-usemin": "^3.0.0",
"grunt-webfont": "^0.5.3",
"matchdep": "^0.3.0",
"mocha": "^2.2.5",
"sinon": "^1.15.3",
"sinon-chai": "^2.8.0"
"chai": "~3.2.0",
"grunt": "~0.4.5",
"grunt-blanket": "~0.0.8",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-concat": "~0.5.1",
"grunt-contrib-copy": "~0.8.0",
"grunt-contrib-cssmin": "~0.13.0",
"grunt-contrib-htmlmin": "~0.4.0",
"grunt-contrib-jshint": "~0.11.2",
"grunt-contrib-less": "~1.0.1",
"grunt-contrib-uglify": "~0.9.1",
"grunt-env": "~0.4.4",
"grunt-express": "~1.4.1",
"grunt-filerev": "~2.3.1",
"grunt-inline-angular-templates": "~0.1.5",
"grunt-line-remover": "~0.0.2",
"grunt-mocha-test": "~0.12.7",
"grunt-replace": "~0.9.3",
"grunt-usemin": "~3.0.0",
"grunt-webfont": "~0.5.4",
"matchdep": "~0.3.0",
"mocha": "~2.2.5",
"sinon": "~1.15.4",
"sinon-chai": "~2.8.0"
},
"scripts": {
"test": "grunt test"
server_config/server_install.sh
+1 -2
View File
@@ -12,7 +12,7 @@ sudo apt-get install -y nodejs
source ~/.profile
# Installation of some packages globally
npm install bower forever grunt-cli -g
npm install forever grunt-cli -g
source ~/.profile
# Installation of YellowLabTools
@@ -22,7 +22,6 @@ cd /space
git clone https://github.com/gmetais/YellowLabTools.git --branch master
cd YellowLabTools
npm install || exit 1
bower install --config.interactive=false --allow-root || exit 1
# Front-end compilation
grunt build
server_config/server_update.sh
+1 -3
View File
@@ -10,11 +10,9 @@ git stash
git pull
git stash pop
# In case something was added in package.json or bower.json
# In case something was added in package.json
rm -rf node_modules
npm install || exit 1
rm -rf bower_components
bower install --config.interactive=false --allow-root || exit 1
# Front-end compilation
rm -rf front/build