feat(assets): rattrape la conf du cookiecutter

pull/17/head
François Poulain 2019-03-12 16:39:57 +01:00 commité par François Poulain
Parent 58dadfba42
révision d2caa37966
5 fichiers modifiés avec 39 ajouts et 36 suppressions

Voir le fichier

@ -1,8 +1,9 @@
import './lib/bootstrap';
import $ from 'jquery';
import './vendor/bootstrap';
// Export jQuery for external usage
window.$ = $;
window.jQuery = window.$ = $; // eslint-disable-line no-multi-assign
// -----------------------------------------------------------------------------
// Main application
@ -12,4 +13,5 @@ $(() => {
// Initialize Popover and Tooltip on the whole page
$('[data-toggle="popover"]').popover();
$('[data-toggle="tooltip"]').tooltip();
$('.no-js').removeClass('no-js');
});

Voir le fichier

@ -1,21 +1,17 @@
// -----------------------------------------------------------------------------
// Bootstrap 4
// -----------------------------------------------------------------------------
// see: ~bootstrap/js/src/index.js
// see: ../../node_modules/bootstrap/js/src/index.js
// Import all Bootstrap components
import 'bootstrap';
// ... or import them individually
// import 'bootstrap/js/dist/util';
import 'bootstrap/js/dist/util';
// import 'bootstrap/js/dist/alert';
import 'bootstrap/js/dist/button';
// import 'bootstrap/js/dist/carousel';
// import 'bootstrap/js/dist/collapse';
// import 'bootstrap/js/dist/dropdown';
import 'bootstrap/js/dist/dropdown';
// import 'bootstrap/js/dist/modal';
// import 'bootstrap/js/dist/popover';
// import 'bootstrap/js/dist/scrollspy';
// import 'bootstrap/js/dist/tab';
// import 'bootstrap/js/dist/toast';
// import 'bootstrap/js/dist/tooltip';

Voir le fichier

@ -105,20 +105,22 @@ gulp.task('css',
/// JavaScript ----------------------------------------------------------------
let webpackConfig = {
devtool: 'source-map',
mode: 'development',
module: {
rules: [
{
test: /.js$/,
use: [
{
loader: 'babel-loader'
use: {
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env'],
compact: false
}
]
}
}
]
},
devtool: 'source-map',
stats: {
chunks: false,
entrypoints: false,
@ -228,14 +230,17 @@ function proxyServer(done) {
proxy: CONFIG.SERVER_PROXY,
port: CONFIG.SERVER_PORT,
serveStatic: [
{
route: '/static',
dir: CONFIG.BUILD_PATH
},
{
route: '/styleguide',
dir: './styleguide'
}
],
ghostMode: false,
notify: false,
online: false
notify: false
});
done();
}
@ -251,8 +256,7 @@ function styleguideServer(done) {
},
port: CONFIG.SERVER_PORT,
ghostMode: false,
notify: false,
online: false
notify: false
});
done();
}

Voir le fichier

@ -11,40 +11,40 @@
"styleguide": "gulp serve:styleguide"
},
"dependencies": {
"bootstrap": "~4.1.3",
"fork-awesome": "^1.1.2",
"bootstrap": "~4.3.1",
"fork-awesome": "^1.1.7",
"jquery": ">=3.0.0",
"popper.js": "^1.14.4"
},
"devDependencies": {
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/core": "^7.3.4",
"@babel/preset-env": "^7.3.4",
"babel-loader": "^8.0.2",
"browser-sync": "^2.26.3",
"eslint": "^5.6.1",
"eslint": "^5.15.1",
"gulp": "^4.0.0",
"gulp-autoprefixer": "^6.0.0",
"gulp-babel": "^8.0.0",
"gulp-clean-css": "^3.10.0",
"gulp-clean-css": "^4.0.0",
"gulp-cli": "^2.0.1",
"gulp-eslint": "^5.0.0",
"gulp-imagemin": "^4.1.0",
"gulp-imagemin": "^5.0.3",
"gulp-load-plugins": "^1.1.0",
"gulp-rename": "^1.4.0",
"gulp-sass": "^4.0.1",
"gulp-sourcemaps": "^2.6.4",
"gulp-stylelint": "^7.0.0",
"gulp-terser": "^1.0.1",
"gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.6.5",
"gulp-stylelint": "^8.0.0",
"gulp-terser": "^1.1.7",
"merge-stream": "^1.0.1",
"style-sherpa": "^1.0.0",
"stylelint": "^9.6.0",
"stylelint": "^9.10.1",
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-order": "^1.0.0",
"stylelint-scss": "^3.3.1",
"stylelint-order": "^2.1.0",
"stylelint-scss": "^3.5.4",
"vinyl-named": "^1.1.0",
"webpack": "^4.17.2",
"webpack-stream": "^5.1.1"
"webpack": "^4.29.6",
"webpack-stream": "^5.2.1"
},
"private": true
}

Voir le fichier

@ -15,6 +15,7 @@
{% block css %}
<link rel="stylesheet" href="{% minified "css/app.css" %}">
<link rel="stylesheet" href="{% minified "css/fork-awesome.css" %}">
{% endblock %}
{% block extra_head %}{% endblock %}