Skip to content
This repository has been archived by the owner on Dec 28, 2022. It is now read-only.

Commit

Permalink
🚀 Fix build process & update packages
Browse files Browse the repository at this point in the history
:packages: Update packages
🚀 Fix node-sass build process
🎨 Not using a log file.  Closing #11 for now.
:art: Temporailt disabled redux-devtools due to zalmoxisus/redux-devtools-extension#47
  • Loading branch information
Gum-Joe committed May 28, 2018
1 parent bff6eb9 commit d7f9e50
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 36 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@ out
src/semantic

# Library builds
lib
lib

# Node-sass backup
.node-sass-vendor
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"global": "^4.3.2",
"jquery": "^3.3.1",
"less": "3.0.4",
"node-abi": "^2.4.1",
"node-sass": "^4.9.0",
"npm": "6.0.1",
"parse-color": "^1.0.0",
Expand Down
34 changes: 15 additions & 19 deletions scripts/build-node-sass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,29 @@
. ./scripts/build-vars.sh

echo "Building node-sass for electron..."
#echo "Building standard bindings..."
#echo "> npm rebuild node-sass"
#npm rebuild node-sass
cd node_modules/node-sass
echo "Copying old node-sass bindings..."
echo "> cp -av node_modules/node-sass/vendor/. .node-sass-backup/"
cp -av node_modules/node-sass/vendor/. .node-sass-backup/
#echo "Removing old bindings..."
#echo "> rm -rf vendor/."
#rm -rfv vendor
echo ""
echo "> mkdir vendor"
mkdir -v vendor
echo ""
echo "Building new ones..."
echo "mkdir ~/.electron-gyp"
echo "Rebuilding node-sass..."
echo "> mkdir ~/.electron-gyp"
mkdir -v ~/.electron-gyp
echo "> npm rebuild -f node-sass"
HOME=~/.electron-gyp npm rebuild -f node-sass
echo ""
echo "> HOME=~/.electron-gyp npm run build"
HOME=~/.electron-gyp npm run build
echo ""
echo "Renaming correctly..."
cd vendor
echo "Renaming..."
cd node_modules/node-sass/vendor
export CURRENT_NAME=$(ls)
export CURRENT_NUMBER="${CURRENT_NAME:$((${#CURRENT_NAME}-2)):1}""${CURRENT_NAME:$((${#CURRENT_NAME}-1)):1}" # From http://stackoverflow.com/questions/17542892/how-to-get-the-last-character-of-a-string-in-a-shell
export NEW_NAME=$(echo "$CURRENT_NAME" | tr "$CURRENT_NUMBER" "$electron_id")
#export NEW_NAME_LOADER=$(echo "$CURRENT_NAME" | tr "$CURRENT_NUMBER" "$electron_id_loader")
#echo "> mv $CURRENT_NAME $NEW_NAME"
#mv -v $CURRENT_NAME $NEW_NAME
echo "> cp -R $CURRENT_NAME $NEW_NAME"
cp -R $CURRENT_NAME $NEW_NAME
echo "> mv $CURRENT_NAME $NEW_NAME"
mv $CURRENT_NAME $NEW_NAME
echo ""
echo "Copying old dirs.."
echo "> cp -av ../../../.node-sass-backup/. ./"
cp -av ../../../.node-sass-backup/. ./
echo ""
echo "Done."
2 changes: 1 addition & 1 deletion scripts/build-vars.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# File to contain electron build vars
# Electron's version.
export npm_config_target=1.8.1
export npm_config_target=2.0.0
# The architecture of Electron, can be ia32 or x64.
export npm_config_arch=x64
export npm_config_target_arch=x64
Expand Down
5 changes: 3 additions & 2 deletions src/config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"theme": "one-fluent-theme",
"window": {
"scripts": [
"D:\\Users\\Kishan\\Documents\\Projects\\tara\\src\\packages\\tara-explorer\\browser\\index.js"
"D:\\Users\\Kishan\\Documents\\Projects\\tara\\src\\packages\\tara-explorer\\browser\\index.js",
"D:\\Users\\Kishan\\Documents\\Projects\\tara-2\\src\\packages\\tara-explorer\\browser\\index.js"
]
}
}
}
7 changes: 0 additions & 7 deletions src/config/db/right-click-context-menu/explorer-files.db

This file was deleted.

1 change: 0 additions & 1 deletion src/config/db/right-click-context-menu/tmp.db

This file was deleted.

6 changes: 3 additions & 3 deletions src/packages/tara-core/src/install-extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default function installExtensions() {
installExtension(REACT_DEVELOPER_TOOLS)
.then((name) => logger.info(`Added Extension: ${chalk.blue(name)}`))
.catch((err) => logger.throw(err));
installExtension(REDUX_DEVTOOLS)
.then((name) => logger.info(`Added Extension: ${chalk.blue(name)}`))
.catch((err) => logger.throw(err));
// installExtension(REDUX_DEVTOOLS)
// .then((name) => logger.info(`Added Extension: ${chalk.blue(name)}`))
// .catch((err) => logger.throw(err));
}
}
4 changes: 2 additions & 2 deletions src/packages/tara-core/src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class Logger {
private argv: string[];
private isDebug: boolean;
private type: "WINDOW" | "PROCESS" | "WINDOW_SENT";
private logFileStream: WriteStream;
// private logFileStream: WriteStream;
private chalk: Chalk;
constructor(args: LoggerArgs) {
this.args = args || { name: "logger" };
Expand All @@ -25,7 +25,7 @@ export default class Logger {
this.type = WINDOW_TYPE;
} else {
this.type = PROCESS_TYPE;
this.logFileStream = createWriteStream(LOG_FILE, { flags: "a" });
// this.logFileStream = createWriteStream(LOG_FILE, { flags: "a" });
// Start listening
if (args.windowLogger) {
const { ipcMain } = require("electron");
Expand Down
6 changes: 6 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10929,6 +10929,12 @@ node-abi@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.0.2.tgz#00f3e0a58100eb480133b48c99a32cc1f9e6c93e"

node-abi@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923"
dependencies:
semver "^5.4.1"

node-dir@0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
Expand Down

0 comments on commit d7f9e50

Please sign in to comment.