@fugood/bricks-project 2.21.0-beta.16 → 2.21.0-beta.16-1

package/api/instance.ts

@@ -64,7 +64,7 @@ export const deployApp = async (
   stage: Stage,
   appId: string,
   config: Config,
-  lastCommitId: string,
+  lastCommitId?: string,
 ) => {
   const app = await pullApp(stage, appId)
   if (app.config?.bricks_project_last_commit_id === lastCommitId)
@@ -135,7 +135,7 @@ export const deployModule = async (
   stage: Stage,
   modId: string,
   config: Config,
-  lastCommitId: string,
+  lastCommitId?: string,
 ) => {
   const mod = await pullModule(stage, modId)
   if (mod.config?.bricks_project_last_commit_id === lastCommitId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.21.0-beta.16",
+  "version": "2.21.0-beta.16-1",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -12,6 +12,5 @@
     "escodegen": "^2.1.0",
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
-  },
-  "gitHead": "5a3d442c4eca74ab88878feac51c927c3fdbd6f6"
+  }
 }

package/tools/deploy.ts

@@ -3,10 +3,21 @@ import { deployApp, deployModule } from '../api'
 
 const cwd = process.cwd()
 
-const unstagedChanges = await $`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
-if (unstagedChanges) throw new Error('Unstaged changes found, please commit or stash your changes before deploying')
+const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
+const isGitRepo = exitCode === 0
+
+let commitId = ''
+if (isGitRepo) {
+  const unstagedChanges = await $`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
+  if (unstagedChanges)
+    throw new Error('Unstaged changes found, please commit or stash your changes before deploying')
+
+  commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
+} else {
+  const confirmContinue = prompt('No git repository found, continue? (y/n)')
+  if (confirmContinue !== 'y') throw new Error('Deployment cancelled')
+}
 
-const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
 const app = await Bun.file(`${cwd}/application.json`).json()
 const stage = app.stage || 'production'
 const config = await Bun.file(`${cwd}/.bricks/build/application-config.json`).json()

package/tools/pull.ts

@@ -15,24 +15,34 @@ const { files, lastCommitId } =
     ? await pullModuleProject(stage, app.id)
     : await pullApplicationProject(stage, app.id)
 
-const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
-  .trim()
-  .match(/^[a-f0-9]{40}$/)
+const { exitCode } = await $`cd ${cwd} && git status`.nothrow()
+const isGitRepo = exitCode === 0
 
-const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
+let useMain = false
+if (isGitRepo) {
+  const found = (await $`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
+    .trim()
+    .match(/^[a-f0-9]{40}$/)
 
-if (commitId === lastCommitId) throw new Error('Commit not changed')
+  const commitId = (await $`cd ${cwd} && git rev-parse HEAD`.text()).trim()
 
-const branchName = 'BRICKS_PROJECT_try-pull-application'
+  if (commitId === lastCommitId) throw new Error('Commit not changed')
 
-await $`cd ${cwd} && git branch -D ${branchName}`.nothrow()
+  const branchName = 'BRICKS_PROJECT_try-pull-application'
 
-let useMain = false
-if (found) {
-  await $`cd ${cwd} && git checkout -b ${branchName} ${lastCommitId}`.nothrow()
+  await $`cd ${cwd} && git branch -D ${branchName}`.nothrow()
+
+  if (found) {
+    await $`cd ${cwd} && git checkout -b ${branchName} ${lastCommitId}`.nothrow()
+  } else {
+    await $`cd ${cwd} && git checkout -b ${branchName}`
+    useMain = true
+  }
 } else {
-  await $`cd ${cwd} && git checkout -b ${branchName}`
-  useMain = true
+  const confirmContinue = prompt(
+    'No git repository found, so it will not be safe to pull, continue? (y/n)',
+  )
+  if (confirmContinue !== 'y') throw new Error('Pull cancelled')
 }
 
 await Promise.all(
@@ -44,8 +54,10 @@ await Promise.all(
   ),
 )
 
-await $`cd ${cwd} && git add .`
-await $`cd ${cwd} && git commit -m 'Apply ${app.name} file changes'`
-if (!useMain) {
-  await $`cd ${cwd} && git merge main`
+if (isGitRepo) {
+  await $`cd ${cwd} && git add .`
+  await $`cd ${cwd} && git commit -m 'Apply ${app.name} file changes'`
+  if (!useMain) {
+    await $`cd ${cwd} && git merge main`
+  }
 }