Skip to content

Commit bd7130d

Browse files
authored
Merge pull request #291 from manosim/remove-gulp
Remove Gulp - Use node-sass
2 parents 79a285b + 6a1daa8 commit bd7130d

File tree

3 files changed

+17
-642
lines changed

3 files changed

+17
-642
lines changed

gulpfile.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
"description": "GitHub Notifications on your menu bar.",
55
"main": "main.js",
66
"scripts": {
7-
"build-js": "mkdir -p dist/js/ && browserify -t babelify --ignore-missing --no-builtins --no-commondir --insert-global-vars=\"global\" --no-browser-field --exclude electron src/js/app.js | uglifyjs > dist/js/app.js",
8-
"build": "npm run build-js && gulp build",
7+
"copy-fonts": "mkdir -p dist/fonts && cp -r node_modules/font-awesome/fonts dist/ && cp -r node_modules/octicons/build/font/* dist/fonts",
8+
"build-js": "mkdir -p dist/js && browserify -t babelify --ignore-missing --no-builtins --no-commondir --insert-global-vars=\"global\" --no-browser-field --exclude electron src/js/app.js | uglifyjs > dist/js/app.js",
9+
"build-scss": "mkdir -p dist/css && node-sass --output-style compressed src/scss/app.scss dist/css/app.css",
10+
"build": "npm run copy-fonts && npm run build-js && npm run build-scss",
911
"watch-js": "watchify -t babelify --ignore-missing --no-builtins --no-commondir --insert-global-vars=\"global\" --no-browser-field --exclude electron src/js/app.js -o dist/js/app.js -v",
10-
"watch": "gulp build && npm run watch-js & gulp watch",
12+
"watch-scss": "node-sass -w src/scss/app.scss dist/css/app.css",
13+
"watch": "npm run build && npm run watch-js & npm run watch-scss",
1114
"package": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --electron-version=1.6.10 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
1215
"codesign": "bash scripts/codesign.bash",
1316
"dist": "npm run build && npm run package && npm run codesign",
@@ -100,10 +103,9 @@
100103
"enzyme": "=2.8.2",
101104
"eslint": "=3.19.0",
102105
"eslint-plugin-react": "=7.0.1",
103-
"gulp": "=3.9.1",
104-
"gulp-sass": "=3.1.0",
105106
"jest": "=20.0.4",
106107
"nock": "=9.0.13",
108+
"node-sass": "=4.5.3",
107109
"react-test-renderer": "=15.5.4",
108110
"redux-logger": "=3.0.6",
109111
"redux-mock-store": "=1.2.3",

0 commit comments

Comments
 (0)