LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Update file structure to follow electron-webpack guidelines #791

Merged
IGassmann merged 3 commits from restructuring into master 2017-11-28 01:26:06 +01:00
Conversation 2 Commits 3 Files changed 339 +1 -8
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1d9a5d90cf - Show all commits

5
README.md
View file

@ -66,11 +66,8 @@ python -m pip install -r build\requirements.txt
npm install -g yarn npm install -g yarn
yarn install yarn install
``` ```
<<<<<<< HEAD
3. Change directory to `src\main` and run the following: 3. Change directory to `src\main` and run the following:
=======
3. Change directory to `src\main` and run the following;
>>>>>>> dbf0fae5... Update file structure to follow electron-webpack guidelines
``` ```
yarn install yarn install
node_modules\.bin\electron-rebuild node_modules\.bin\electron-rebuild

4
build/build.ps1
View file

@ -17,11 +17,7 @@ cd ..\..
# build ui # build ui
<<<<<<< HEAD
cd src\renderer cd src\renderer
=======
cd main\renderer
>>>>>>> dbf0fae5... Update file structure to follow electron-webpack guidelines
yarn install yarn install
npm rebuild node-sass npm rebuild node-sass
node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\ node_modules\.bin\node-sass --output dist\css --sourcemap=none scss\

0
ui/js/util/redux-utils.js → src/renderer/js/util/redux-utils.js
View file