From 3be1300672608da6383807c6e302b8b9b8ea6e4b Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Sun, 23 Jan 2022 21:27:35 -0300 Subject: [PATCH] fix(all): yarn vs npm on MSFT. --- deploy.sh | 14 -------------- packages/core.gbapp/services/GBDeployer.ts | 8 ++++---- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/deploy.sh b/deploy.sh index 156d8d74e..89f9c15ac 100644 --- a/deploy.sh +++ b/deploy.sh @@ -83,20 +83,6 @@ echo "[General Bots Deployer] Transpiling..." eval ./node_modules/typescript/bin/tsc -v eval ./node_modules/typescript/bin/tsc -p "$DEPLOYMENT_SOURCE" -# 1.1 Install default.gbui npm packages -if [ -e "$DEPLOYMENT_SOURCE/packages/default.gbui/package.json" ]; then - echo "[General Bots Deployer] Running npm install for default.gbui..." - cd "$DEPLOYMENT_SOURCE/packages/default.gbui" - eval yarn install - exitWithMessageOnError "npm failed" - echo "[Genseral Bots Deployer] Building react app..." - eval npm run build - echo "[General Bots Deployer] OK." - cd "$DEPLOYMENT_SOURCE" - exitWithMessageOnError "react build failed" - cd - > /dev/null -fi - echo "[General Bots Deployer] OK." diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts index c3149d936..f3b0e0cbe 100644 --- a/packages/core.gbapp/services/GBDeployer.ts +++ b/packages/core.gbapp/services/GBDeployer.ts @@ -807,12 +807,12 @@ export class GBDeployer implements IGBDeployer { // Install modules and compiles the web app. - // GBLog.info(`Installing modules default.gbui (It may take a few minutes)...`); + GBLog.info(`Installing modules default.gbui (It may take a few minutes)...`); - // child_process.execSync(`${npm} install`, { cwd: root }); + child_process.execSync(`yarn install`, { cwd: root }); - // GBLog.info(`Transpiling default.gbui...`); - // child_process.execSync(`${npm} run build`, { cwd: root }); + GBLog.info(`Transpiling default.gbui...`); + child_process.execSync(`${npm} run build`, { cwd: root }); } }