Skip to content
This repository has been archived by the owner on Feb 5, 2021. It is now read-only.

Commit

Permalink
HID-1820: remove ruby dependency for Sass compiles
Browse files Browse the repository at this point in the history
Switching grunt plugins allows use of node-sass, meaning Ruby
is no longer a devDependency for this project
  • Loading branch information
rupl committed Jul 26, 2019
1 parent 6755586 commit 3a28a56
Show file tree
Hide file tree
Showing 4 changed files with 532 additions and 68 deletions.
18 changes: 6 additions & 12 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,13 @@ module.exports = function(grunt) {
},
sass: {
dist: {
files: {
'src/assets/css/main.css': 'src/assets/css/main.scss'
}
src: 'src/assets/css/main.scss',
dest: 'src/assets/css/main.css',
},
api: {
files: {
'src/assets/css/api.css': 'src/assets/css/api.scss'
},
options: {
sourcemap: 'none',
style: 'compressed'
}
}
src: 'src/assets/css/api.scss',
dest: 'src/assets/css/api.css',
},
},
watch: {
sass: {
Expand Down Expand Up @@ -232,7 +226,7 @@ module.exports = function(grunt) {

grunt.loadNpmTasks('grunt-angular-gettext');
grunt.loadNpmTasks('grunt-sass-import');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-node-sass');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-watch');
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
* [Docker for Mac](https://docs.docker.com/docker-for-mac/) / Docker for your OS of choice
* [Node](https://nodejs.org/en/)
* [Yarn](https://yarnpkg.com/lang/en/docs/install/)
* [Bower](https://bower.io/#install-bower)
* [Grunt](http://gruntjs.com/getting-started)
* [Ruby](https://www.ruby-lang.org/en/)
* [Sass](http://sass-lang.com/install)


Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hid_app2",
"version": "0.1.2",
"version": "0.2.0",
"description": "HID Client application",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,14 +29,14 @@
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^3.0.0",
"grunt-contrib-sass": "^1.0.0",
"grunt-contrib-uglify": "^4.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-dom-munger": "^3.4.0",
"grunt-karma": "^3.0.1",
"grunt-manifest": "^0.4.4",
"grunt-modernizr": "^2.0.1",
"grunt-ng-annotate": "^3.0.0",
"grunt-node-sass": "^1.0.1",
"grunt-sass-import": "^0.2.2",
"grunt-svgmin": "^6.0.0",
"grunt-usemin": "^3.1.1",
Expand All @@ -50,8 +50,8 @@
"karma-jasmine": "^2.0.1",
"karma-ng-html2js-preprocessor": "^1.0.0",
"lodash": ">=4.17.15",
"phantomjs-polyfill-object-assign": "0.0.2",
"minimatch": ">=3.0.2",
"phantomjs-polyfill-object-assign": "0.0.2",
"shelljs": ">=0.8.3"
},
"dependencies": {
Expand Down
Loading

0 comments on commit 3a28a56

Please sign in to comment.