From e31560f622b56f1829575f463ccb525c6882c841 Mon Sep 17 00:00:00 2001 From: Tchama Date: Thu, 4 Oct 2018 16:32:00 +0200 Subject: [PATCH] edit yarn grunt/bower config during chill installation --- .gitignore | 6 +++++- Resources/bower.json | 2 +- Resources/package.json | 9 ++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7923548b4..bf3c8f602 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,8 @@ Resources/public/sass/* !Resources/public/sass/_timeline.scss !Resources/public/sass/custom/ -/nbproject/private/ \ No newline at end of file +/nbproject/private/ + +# Yarn lock +Resources/package-lock.json +Resources/yarn.lock diff --git a/Resources/bower.json b/Resources/bower.json index d1903bb57..c179fdf8d 100644 --- a/Resources/bower.json +++ b/Resources/bower.json @@ -8,7 +8,7 @@ "description": "JS-CSS files for Chill, a software for social workers", "private": true, "devDependencies": { - "Scratch-CSS-Design": "git@github.com:Champs-Libres/ScratchCSS.git", + "Scratch-CSS-Design": "https://github.com/Champs-Libres/ScratchCSS.git", "pikaday": "https://github.com/dbushell/Pikaday.git#~1.2.0", "moment": "~2.8.3", "select2": "~3.5.2", diff --git a/Resources/package.json b/Resources/package.json index dae6ce776..b25e525a6 100644 --- a/Resources/package.json +++ b/Resources/package.json @@ -2,17 +2,16 @@ "name": "chill-js-css", "version": "0.0.0", "description": "JS-CSS files for Chill, a software for social workers", - "directories": { - }, + "directories": {}, "author": "Champs-Libres ", "devDependencies": { - "grunt": "^0.4.5", + "grunt": "^1.0.3", "grunt-bower-task": "^0.4.0", + "grunt-contrib-clean": "^0.6.0", "grunt-contrib-copy": "^0.7.0", "grunt-contrib-sass": "^0.8.1", - "jit-grunt": "^0.9.0", "grunt-contrib-watch": "^0.6.1", - "grunt-contrib-clean": "^0.6.0" + "jit-grunt": "^0.9.0" }, "dependencies": {} }