cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-02-09 08:00:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

update grunt-sass to latest version (#1544)

Browse Source 
* update grunt-sass

* add to contributors

* update gulp deps

* update grunt deps

* add convenience run script to grunt and gulp configurations
This commit is contained in:
Eric Groom 2018-03-06 08:46:21 -08:00 committed by Nikita Shupeyko
parent 218a79e16a
commit f67f37a463
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.rst
View File

@ -89,6 +89,7 @@ Listed in alphabetical order.
Dong Huynh `@trungdong`_ Dong Huynh `@trungdong`_
Emanuel Calso `@bloodpet`_ @bloodpet Emanuel Calso `@bloodpet`_ @bloodpet
Eraldo Energy `@eraldo`_ Eraldo Energy `@eraldo`_
Eric Groom `@ericgroom`_
Eyad Al Sibai `@eyadsibai`_ Eyad Al Sibai `@eyadsibai`_
Felipe Arruda `@arruda`_ Felipe Arruda `@arruda`_
Garry Cairns `@garry-cairns`_ Garry Cairns `@garry-cairns`_

2
docs/live-reloading-and-sass-compilation.rst
View File

@ -15,7 +15,7 @@ If you don't already have it, install `compass` (doesn't hurt if you run this co
Now you just need:: Now you just need::
$ grunt serve $ npm run dev
The base app will now run as it would with the usual ``manage.py runserver`` but with live reloading and Sass compilation enabled. The base app will now run as it would with the usual ``manage.py runserver`` but with live reloading and Sass compilation enabled.

2
{{cookiecutter.project_slug}}/Gruntfile.js
View File

@ -92,7 +92,7 @@ module.exports = function (grunt) {
processors: [ processors: [
require('pixrem')(), // add fallbacks for rem units require('pixrem')(), // add fallbacks for rem units
require('autoprefixer-core')({browsers: [ require('autoprefixer')({browsers: [
'Android 2.3', 'Android 2.3',
'Android >= 4', 'Android >= 4',
'Chrome >= 20', 'Chrome >= 20',

34
{{cookiecutter.project_slug}}/package.json
View File

@ -4,22 +4,22 @@
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
{% if cookiecutter.js_task_runner == 'Grunt' %} {% if cookiecutter.js_task_runner == 'Grunt' %}
"autoprefixer-core": "~5.2.1", "autoprefixer": "~8.1.0",
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
"bootstrap": "^4.0.0", "bootstrap": "^4.0.0",
{% endif %} {% endif %}
"connect-livereload": "~0.3.2", "connect-livereload": "~0.6.0",
"cssnano": "~2.1.0", "cssnano": "~3.10.0",
"grunt": "~0.4.5", "grunt": "~1.0.2",
"grunt-bg-shell": "~2.3.1", "grunt-bg-shell": "~2.3.1",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~1.0.0",
"grunt-postcss": "~0.5.5", "grunt-postcss": "~0.9.0",
"grunt-sass": "~1.0.0", "grunt-sass": "~2.1.0",
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
"jquery": "^3.2.1-slim", "jquery": "^3.2.1-slim",
{% endif %} {% endif %}
"load-grunt-tasks": "~3.2.0", "load-grunt-tasks": "~3.2.0",
"pixrem": "~1.3.1", "pixrem": "~4.0.1",
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
"popper.js": "^1.12.3", "popper.js": "^1.12.3",
{% endif %} {% endif %}
@ -31,26 +31,34 @@
"browser-sync": "^2.14.0", "browser-sync": "^2.14.0",
"del": "^2.2.2", "del": "^2.2.2",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1", "gulp-autoprefixer": "^5.0.0",
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
{% endif %} {% endif %}
"gulp-cssnano": "^2.1.2", "gulp-cssnano": "^2.1.2",
"gulp-imagemin": "^3.0.3", "gulp-imagemin": "^4.1.0",
"gulp-pixrem": "^1.0.0", "gulp-pixrem": "^1.0.0",
"gulp-plumber": "^1.1.0", "gulp-plumber": "^1.1.0",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",
"gulp-sass": "^2.3.2", "gulp-sass": "^3.1.0",
"gulp-uglify": "^2.0.0", "gulp-uglify": "^3.0.0",
"gulp-util": "^3.0.7", "gulp-util": "^3.0.7",
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
"jquery": "^3.2.1-slim", "jquery": "^3.2.1-slim",
"popper.js": "^1.12.3", "popper.js": "^1.12.3",
{% endif %} {% endif %}
"run-sequence": "^1.2.2" "run-sequence": "^2.1.1"
{% endif %} {% endif %}
}, },
"engines": { "engines": {
"node": ">=0.8.0" "node": ">=0.8.0"
},
"scripts": {
{% if cookiecutter.js_task_runner == 'Grunt' %}
"dev": "grunt serve"
{% elif cookiecutter.js_task_runner == 'Gulp' %}
"dev": "gulp"
{% endif %}
} }
} }