From 7e0ddc422bb219e2b061f56cebb791be3b6f438e Mon Sep 17 00:00:00 2001 From: pauliusguzas Date: Tue, 6 Jun 2023 13:43:49 +0300 Subject: [PATCH 1/5] chore: add monorepo vercel support --- packages/build-hooks/package.json | 2 +- packages/build-hooks/src/deploy/iosFirebase.ts | 3 ++- packages/build-hooks/src/deploy/vercel.ts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/build-hooks/package.json b/packages/build-hooks/package.json index c5df5c2..e633328 100644 --- a/packages/build-hooks/package.json +++ b/packages/build-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@flexn/build-hooks", - "version": "0.30.0", + "version": "0.30.0-feat.0", "description": "Flexn Build Hooks", "main": "lib/index", "types": "lib/index", diff --git a/packages/build-hooks/src/deploy/iosFirebase.ts b/packages/build-hooks/src/deploy/iosFirebase.ts index 0f12913..e273880 100644 --- a/packages/build-hooks/src/deploy/iosFirebase.ts +++ b/packages/build-hooks/src/deploy/iosFirebase.ts @@ -14,9 +14,10 @@ const iosFirebaseDeploy = (config: any) => const token = config.files.workspace.project?.configPrivate?.firebase?.token; const firebaseId = Common.getConfigProp(config, config.platform, 'firebaseId'); + const firebaseGroups = Common.getConfigProp(config, config.platform, 'firebaseGroups'); const title = Common.getConfigProp(config, config.platform, 'title'); - const args = `firebase appdistribution:distribute ${ipaPath} --app ${firebaseId} --groups "RS" --token="${token}"`; + const args = `firebase appdistribution:distribute ${ipaPath} --app ${firebaseId} --groups "${firebaseGroups}" --token="${token}"`; Exec.executeAsync(config, args, { shell: true, diff --git a/packages/build-hooks/src/deploy/vercel.ts b/packages/build-hooks/src/deploy/vercel.ts index 44ab83d..d680073 100644 --- a/packages/build-hooks/src/deploy/vercel.ts +++ b/packages/build-hooks/src/deploy/vercel.ts @@ -13,7 +13,7 @@ const vercelDeploy = async (config: any) => { // remove .vercel/project.json othwerise it will deploy to the last location try { - fs.unlinkSync(`${process.cwd()}/platformBuilds/${config.runtime.appId}_${platform}/.vercel/project.json`); + fs.unlinkSync(`${process.cwd()}/../../.vercel/project.json`); } catch (_) { // it's deleted most likely } @@ -25,7 +25,7 @@ const vercelDeploy = async (config: any) => { await Exec.executeAsync( config, - `npx vercel ./platformBuilds/${config.runtime.appId}_${platform}/output --token=${ + `npx vercel ../../. --token=${ process.env.VERCEL_TOKEN || token } --name=${vercelProjectName} --scope=flexn -f --confirm --prod`, { From e621608910886044d5fb50da3a84d10890bc483d Mon Sep 17 00:00:00 2001 From: pauliusguzas Date: Tue, 27 Jun 2023 14:35:40 +0300 Subject: [PATCH 2/5] chore: update vercel build-hooks --- packages/build-hooks/src/deploy/vercel.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/build-hooks/src/deploy/vercel.ts b/packages/build-hooks/src/deploy/vercel.ts index d680073..b03c654 100644 --- a/packages/build-hooks/src/deploy/vercel.ts +++ b/packages/build-hooks/src/deploy/vercel.ts @@ -5,15 +5,19 @@ import { notifySlack } from '../slackNotifier'; const { logSuccess, logError } = Logger; const vercelDeploy = async (config: any) => { - const { platform } = config; - + const { platform, files } = config; + const isMonorepo = files.project.package.workspaces !== undefined; const title = Common.getConfigProp(config, config.platform, 'title'); const { version } = config.files.project.package; const token = config.files.workspace.project?.configPrivate?.vercel?.token; // remove .vercel/project.json othwerise it will deploy to the last location try { - fs.unlinkSync(`${process.cwd()}/../../.vercel/project.json`); + fs.unlinkSync( + `${process.cwd()}${ + isMonorepo ? `/../../` : `/platformBuilds/${config.runtime.appId}_${platform}/` + }.vercel/project.json` + ); } catch (_) { // it's deleted most likely } @@ -25,7 +29,9 @@ const vercelDeploy = async (config: any) => { await Exec.executeAsync( config, - `npx vercel ../../. --token=${ + `npx vercel ${ + isMonorepo ? `../../.` : `./platformBuilds/${config.runtime.appId}_${platform}/output` + } --token=${ process.env.VERCEL_TOKEN || token } --name=${vercelProjectName} --scope=flexn -f --confirm --prod`, { From 4cd057820f827ab9ea403aa577fac23081bdd72c Mon Sep 17 00:00:00 2001 From: pauliusguzas Date: Tue, 27 Jun 2023 14:41:42 +0300 Subject: [PATCH 3/5] chore: deploy feat version --- packages/build-hooks/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build-hooks/package.json b/packages/build-hooks/package.json index e633328..2a5a425 100644 --- a/packages/build-hooks/package.json +++ b/packages/build-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@flexn/build-hooks", - "version": "0.30.0-feat.0", + "version": "0.30.0-feat.1", "description": "Flexn Build Hooks", "main": "lib/index", "types": "lib/index", From 4aa793d55f52dd5c2190439dc8d60affd75de140 Mon Sep 17 00:00:00 2001 From: pauliusguzas Date: Mon, 21 Aug 2023 16:37:08 +0300 Subject: [PATCH 4/5] chore: add release status and deploy track --- packages/build-hooks/src/deploy/androidGooglePlay.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/build-hooks/src/deploy/androidGooglePlay.ts b/packages/build-hooks/src/deploy/androidGooglePlay.ts index 8f13fc9..1593d83 100644 --- a/packages/build-hooks/src/deploy/androidGooglePlay.ts +++ b/packages/build-hooks/src/deploy/androidGooglePlay.ts @@ -12,14 +12,21 @@ const androidGPDeploy = async (c: any) => { const appPath = path.join(c.paths.project.builds.dir, `${c.runtime.appId}_${c.platform}`); const aabPath = `${path.join(appPath, `app/build/outputs/bundle/release/app-release.aab`)}`; + const deployTrack = Common.getConfigProp(c, c.platform, 'deployTrack') || 'alpha'; + const releaseStatus = Common.getConfigProp(c, c.platform, 'releaseStatus'); + const credentialsFileName = + Common.getConfigProp(c, c.platform, 'credentialsFileName') || 'play-store-credentials.json'; + // const url = `https://play.google.com/apps/testing/${Common.getConfigProp(c, c.platform, 'id')}`; try { await Exec.executeAsync( c, - `fastlane supply --aab ${aabPath} --track alpha --json_key ${path.join( + `fastlane supply --aab ${aabPath} --track ${deployTrack} ${ + releaseStatus ? `--release_status ${releaseStatus}` : '' + } --json_key ${path.join( c.paths.workspace.project.dir, - 'play-store-credentials.json' + credentialsFileName )} --package_name ${Common.getConfigProp(c, c.platform, 'id')} `, { env: process.env, From d8e661cbdc32617f9abdf2eb85939a7d7496ac7a Mon Sep 17 00:00:00 2001 From: pauliusguzas Date: Mon, 21 Aug 2023 16:48:33 +0300 Subject: [PATCH 5/5] chore: update vercel deploy hook --- packages/build-hooks/src/deploy/vercel.ts | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/build-hooks/src/deploy/vercel.ts b/packages/build-hooks/src/deploy/vercel.ts index b03c654..d680073 100644 --- a/packages/build-hooks/src/deploy/vercel.ts +++ b/packages/build-hooks/src/deploy/vercel.ts @@ -5,19 +5,15 @@ import { notifySlack } from '../slackNotifier'; const { logSuccess, logError } = Logger; const vercelDeploy = async (config: any) => { - const { platform, files } = config; - const isMonorepo = files.project.package.workspaces !== undefined; + const { platform } = config; + const title = Common.getConfigProp(config, config.platform, 'title'); const { version } = config.files.project.package; const token = config.files.workspace.project?.configPrivate?.vercel?.token; // remove .vercel/project.json othwerise it will deploy to the last location try { - fs.unlinkSync( - `${process.cwd()}${ - isMonorepo ? `/../../` : `/platformBuilds/${config.runtime.appId}_${platform}/` - }.vercel/project.json` - ); + fs.unlinkSync(`${process.cwd()}/../../.vercel/project.json`); } catch (_) { // it's deleted most likely } @@ -29,9 +25,7 @@ const vercelDeploy = async (config: any) => { await Exec.executeAsync( config, - `npx vercel ${ - isMonorepo ? `../../.` : `./platformBuilds/${config.runtime.appId}_${platform}/output` - } --token=${ + `npx vercel ../../. --token=${ process.env.VERCEL_TOKEN || token } --name=${vercelProjectName} --scope=flexn -f --confirm --prod`, {