moved away from bower

This commit is contained in:
didier amyot committed 2017-04-23 11:19:06 -04:00
1 parent bb3a616f7c
commit f711a5876d
6 files changed
+51 -62

No files matched your search

+1 -9
View File
@@ -16,13 +16,5 @@
"lib",
"test",
"tests"
],
"dependencies": {
"uikit": "~2.27.2",
"mithril": "~0.2.1",
"lodash": "~4.2.1",
"almond": "~0.3.1",
"requirejs": "~2.1.22",
"spritzjs": "https://gitlab.com/didiercrunch/spritzjs.git"
}
]
}
+4 -10
View File
@@ -1,5 +1,4 @@
var gulp = require('gulp');
var bower = require('gulp-bower');
var help = require('gulp-task-listing');
var clean = require('gulp-clean');
var toml = require('gulp-toml');
@@ -16,14 +15,9 @@ var _ = require('lodash');
gulp.task('help', help);
gulp.task('bower', function(){
return bower()
.pipe(gulp.dest('lib/'))
.on('error', console.log);
});
gulp.task('sass', ['bower'], function(){
var extraSassPath = ['./lib/'];
gulp.task('sass', [], function(){
var extraSassPath = ['./node_modules/'];
return gulp.src('./scss/*.scss')
.pipe(sass({includePaths: extraSassPath}).on('error', console.log))
.pipe(gulp.dest('./css'));
@@ -112,7 +106,7 @@ gulp.task('compile-articles', function(){
});
gulp.task('default', ['bower', 'sass', 'encrypt-results', 'compile-results', 'compile-articles']);
gulp.task('default', ['sass', 'encrypt-results', 'compile-results', 'compile-articles']);
gulp.task('prod', ['default', 'template-prod']);
@@ -126,7 +120,7 @@ gulp.task('webserver', function(){
}));
});
gulp.task('dev', ['default', 'webserver', 'template-dev', 'bower'], function(){
gulp.task('dev', ['default', 'webserver', 'template-dev'], function(){
gulp.watch('./scss/*.scss', ['sass']);
gulp.watch('*.tmpl.html', ['template-dev']);
gulp.watch('./data/articles/**/*', ['compile-articles']);
+1 -1
View File
@@ -17,7 +17,7 @@
<%if(production){ %>
<script src="main-built.js"></script>
<% }else{ %>
<script data-main="script/main" src="lib/requirejs/require.js"></script>
<script data-main="script/main" src="node_modules/requirejs/require.js"></script>
<% } %>
</body>
</html>
+4 -1
View File
@@ -5,7 +5,6 @@
"main": "index.html",
"dependencies": {
"gulp": "^3.9.0",
"gulp-bower": "0.0.13",
"gulp-clean": "^0.3.1",
"gulp-modify": "^0.1.1",
"gulp-rename": "^1.2.2",
@@ -18,6 +17,10 @@
"lodash": "^4.6.1",
"marked": "^0.3.5",
"requirejs": "^2.1.22",
"uikit": "2.27.2",
"mithril": "~0.2.1",
"almond": "~0.3.1",
"requirejs": "~2.1.22",
"spritzjs": "https://gitlab.com/didiercrunch/spritzjs.git"
},
"devDependencies": {
+3 -3
View File
@@ -1,8 +1,8 @@
requirejs.config({
paths: {
'_': '../lib/lodash/dist/lodash.min',
'm': '../lib/mithril/mithril.min',
'spritz': '../lib/spritzjs/dist/spritz'
'_': '../node_modules/lodash/lodash.min',
'm': '../node_modules/mithril/mithril.min',
'spritz': '../node_modules/spritzjs/dist/spritz'
}
});
+38 -38
View File
@@ -1,6 +1,6 @@
// LESS related
@import "uikit/scss/uikit-mixins.scss";
@import "uikit/scss/core/variables.scss";
@import "uikit/dist/scss/uikit-mixins.scss";
@import "uikit/dist/scss/core/variables.scss";
// Phenix colors
@@ -15,51 +15,51 @@ $badge-background: #fce3ca;
$badge-color: black;
// Defaults
@import "uikit/scss/core/base.scss";
@import "uikit/dist/scss/core/base.scss";
// Layout
@import "uikit/scss/core/grid.scss";
@import "uikit/scss/core/panel.scss";
@import "uikit/scss/core/block.scss";
@import "uikit/scss/core/article.scss";
@import "uikit/scss/core/comment.scss";
@import "uikit/scss/core/cover.scss";
@import "uikit/dist/scss/core/grid.scss";
@import "uikit/dist/scss/core/panel.scss";
@import "uikit/dist/scss/core/block.scss";
@import "uikit/dist/scss/core/article.scss";
@import "uikit/dist/scss/core/comment.scss";
@import "uikit/dist/scss/core/cover.scss";
// Navs
@import "uikit/scss/core/nav.scss";
@import "uikit/scss/core/navbar.scss";
@import "uikit/scss/core/subnav.scss";
@import "uikit/scss/core/breadcrumb.scss";
@import "uikit/scss/core/pagination.scss";
@import "uikit/scss/core/tab.scss";
@import "uikit/scss/core/thumbnav.scss";
@import "uikit/dist/scss/core/nav.scss";
@import "uikit/dist/scss/core/navbar.scss";
@import "uikit/dist/scss/core/subnav.scss";
@import "uikit/dist/scss/core/breadcrumb.scss";
@import "uikit/dist/scss/core/pagination.scss";
@import "uikit/dist/scss/core/tab.scss";
@import "uikit/dist/scss/core/thumbnav.scss";
// Elements
@import "uikit/scss/core/list.scss";
@import "uikit/scss/core/description-list.scss";
@import "uikit/scss/core/table.scss";
@import "uikit/scss/core/form.scss";
@import "uikit/dist/scss/core/list.scss";
@import "uikit/dist/scss/core/description-list.scss";
@import "uikit/dist/scss/core/table.scss";
@import "uikit/dist/scss/core/form.scss";
// Common
@import "uikit/scss/core/button.scss";
@import "uikit/scss/core/icon.scss";
@import "uikit/scss/core/close.scss";
@import "uikit/scss/core/badge.scss";
@import "uikit/scss/core/alert.scss";
@import "uikit/scss/core/thumbnail.scss";
@import "uikit/scss/core/overlay.scss";
@import "uikit/scss/core/column.scss";
@import "uikit/scss/core/animation.scss";
@import "uikit/dist/scss/core/button.scss";
@import "uikit/dist/scss/core/icon.scss";
@import "uikit/dist/scss/core/close.scss";
@import "uikit/dist/scss/core/badge.scss";
@import "uikit/dist/scss/core/alert.scss";
@import "uikit/dist/scss/core/thumbnail.scss";
@import "uikit/dist/scss/core/overlay.scss";
@import "uikit/dist/scss/core/column.scss";
@import "uikit/dist/scss/core/animation.scss";
// JavaScript
@import "uikit/scss/core/dropdown.scss";
@import "uikit/scss/core/modal.scss";
@import "uikit/scss/core/offcanvas.scss";
@import "uikit/scss/core/switcher.scss";
@import "uikit/dist/scss/core/dropdown.scss";
@import "uikit/dist/scss/core/modal.scss";
@import "uikit/dist/scss/core/offcanvas.scss";
@import "uikit/dist/scss/core/switcher.scss";
// Need to be loaded last
@import "uikit/scss/core/text.scss";
@import "uikit/scss/core/utility.scss";
@import "uikit/scss/core/flex.scss";
@import "uikit/scss/core/contrast.scss";
@import "uikit/scss/core/print.scss";
@import "uikit/dist/scss/core/text.scss";
@import "uikit/dist/scss/core/utility.scss";
@import "uikit/dist/scss/core/flex.scss";
@import "uikit/dist/scss/core/contrast.scss";
@import "uikit/dist/scss/core/print.scss";