1
0
Fork 0

Replace bower with yarn

merge-requests/204/head
Nikos Roussos 2017-09-08 17:46:02 +03:00
parent 9026ba0943
commit 6aa5b4fe77
No known key found for this signature in database
GPG Key ID: BADFF1767BA7C8E1
13 changed files with 2886 additions and 3294 deletions

View File

@ -1,4 +0,0 @@
{
"interactive": false,
"allow_root": true
}

2
.gitignore vendored
View File

@ -23,8 +23,8 @@ nosetests.xml
# Media & Static
media
/staticfiles/*
bower_components
node_modules
yarn-error.log
# Celery
celerybeat-schedule

View File

@ -1,65 +0,0 @@
{
"name": "satnogs-db",
"description": "Satellite Transmitter Suggestions App",
"version": "0.1.0",
"homepage": "https://github.com/satnogs/satnogs-db",
"license": "AGPL-3.0",
"dependencies": {
"jquery": "2.1.x",
"bootstrap": "3.3.x",
"underscore": "1.8.x",
"backbone": "1.3.x",
"d3": "3.5.x",
"chart.js": "^2.4.0",
"moment": "2.10.6",
"bootstrap-daterangepicker": "2.1.x",
"mapbox.js": "2.2.x",
"dnt-helper": "schalkneethling/dnt-helper",
"gpredict.js": "kerel-fs/gpredict.js"
},
"overrides": {
"jquery": {
"main": "dist/jquery.min.js"
},
"bootstrap": {
"main": [
"dist/css/bootstrap.min.css",
"dist/js/bootstrap.min.js",
"dist/fonts/*"
]
},
"bootstrap-daterangepicker": {
"main": [
"daterangepicker.css",
"daterangepicker.js"
]
},
"mapbox.js": {
"main": [
"mapbox.css",
"mapbox.js"
]
},
"underscore": {
"main": "underscore-min.js"
},
"d3": {
"main": "d3.min.js"
},
"moment": {
"main": "moment.js"
},
"backbone": {
"main": "backbone-min.js"
},
"chart.js": {
"main": "dist/Chart.min.js"
},
"dnt-helper": {
"main": "js/dnt-helper.js"
},
"gpredict.js": {
"main": "dist/gpredict.min.js"
}
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -426,8 +426,8 @@
{% block javascript %}
<script src="{% static 'lib/underscore/underscore-min.js' %}"></script>
<script src="{% static 'lib/backbone/backbone-min.js' %}"></script>
<script src="{% static 'lib/d3/d3.min.js' %}"></script>
<script src="{% static 'lib/moment/moment.js' %}"></script>
<script src="{% static 'lib/d3/build/d3.min.js' %}"></script>
<script src="{% static 'lib/moment/min/moment.min.js' %}"></script>
<script src="{% static 'lib/bootstrap-daterangepicker/daterangepicker.js' %}"></script>
<script src="{% static 'lib/mapbox.js/mapbox.js' %}"></script>
<script src="{% static 'js/app.backbone.js' %}"></script>

View File

@ -1,7 +1,6 @@
/* global require */
var gulp = require('gulp');
var mainBowerFiles = require('gulp-main-bower-files');
var eslint = require('gulp-eslint');
var stylelint = require('gulp-stylelint');
@ -28,14 +27,19 @@ gulp.task('css:lint', () => {
}));
});
gulp.task('bower', function(){
return gulp.src('./bower.json')
.pipe(mainBowerFiles())
.pipe(gulp.dest('./db/static/lib'));
gulp.task('assets', function(){
var p = require('./package.json');
var assets = p.assets;
return gulp.src(assets, {cwd : 'node_modules/**'})
.pipe(gulp.dest('db/static/lib'));
});
gulp.task('default', function() {
gulp.start('bower');
gulp.task('test', function(){
gulp.start('js:lint');
gulp.start('css:lint');
});
gulp.task('default', function() {
gulp.start('assets');
gulp.start('test');
});

View File

@ -4,14 +4,43 @@
"description": "Satellite Transmitter Suggestions Appp",
"repository": {
"type": "git",
"url": "https://github.com/satnogs/satnogs-db"
"url": "https://gitlab.com/librespacefoundation/satnogs/satnogs-db"
},
"author": "SatNOGS",
"license": "AGPLv3",
"license": "AGPL-3.0",
"devDependencies": {
"gulp": "^3.9.1",
"gulp-eslint": "^3.0.1",
"gulp-main-bower-files": "^1.6.1",
"gulp-stylelint": "^3.9.0"
}
},
"dependencies": {
"backbone": "^1.3.3",
"bootstrap": "^3.3.7",
"bootstrap-daterangepicker": "^2.1.25",
"chart.js": "^2.6.0",
"d3": "^4.10.2",
"dnt-helper": "schalkneethling/dnt-helper",
"gpredict.js": "kerel-fs/gpredict.js",
"jquery": "^3.2.1",
"mapbox.js": "^3.1.1",
"moment": "^2.18.1",
"underscore": "^1.8.3"
},
"assets": [
"jquery/dist/jquery.min.js",
"bootstrap/dist/css/bootstrap.min.css",
"bootstrap/dist/js/bootstrap.min.js",
"bootstrap/dist/fonts/*",
"bootstrap-daterangepicker/daterangepicker.css",
"bootstrap-daterangepicker/daterangepicker.js",
"mapbos.js/mapbox.css",
"mapbos.js/mapbox.js",
"underscore/underscore-min.js",
"d3/build/d3.min.js",
"moment/min/moment.min.js",
"backbone/backbone-min.js",
"chart.js/dist/Chart.min.js",
"dnt-helper/js/dnt-helper.js",
"gpredict.js/dist/gpredict.min.js"
]
}

2820
yarn.lock 100644

File diff suppressed because it is too large Load Diff