Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/sass and windows support #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/sass and windows support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52a62d6
Add cross-env dep to support running 'yarn electron-dev' from Windows
jkomyno Apr 11, 2018
d8de242
Switch to using the local dependency of electron instead of the globa…
jkomyno Apr 11, 2018
5e663d0
Closes #1. Add node-sass to enable SASS support
jkomyno Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# node-sass
.sass-cache
*.css
7 changes: 6 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@
"@types/recompose": "^0.24.7",
"@types/yup": "^0.24.3",
"concurrently": "^3.5.1",
"cross-env": "^5.1.4",
"electron": "^1.8.4",
"electron-builder": "^20.8.1",
"electron-debug": "^1.5.0",
"electron-react-devtools": "^0.5.3",
"mobx-wiretap": "^0.13.1",
"node-sass": "^4.8.3",
"react-scripts-ts": "2.14.0",
"tslint-config-prettier": "^1.10.0",
"tslint-react": "^3.5.1",
Expand All @@ -53,7 +55,10 @@
"build": "react-scripts-ts build",
"test": "react-scripts-ts test --env=jsdom",
"eject": "react-scripts-ts eject",
"electron-dev": "concurrently \"BROWSER=none yarn start\" \"wait-on http://localhost:3000 && electron .\"",
"sass:build": "node-sass ./src -o ./src",
"sass:watch": "yarn sass:build -w -r",
"sass": "yarn sass:build && yarn sass:watch",
"electron-dev": "concurrently \"yarn sass\" \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && yarn electron .\"",
"prettier": "prettier --write 'src/**/*.js'"
}
}
0 src/App.css → src/App.scss
View file
Open in desktop
File renamed without changes.
0 src/index.css → src/index.scss
View file
Open in desktop
File renamed without changes.
Loading