Просмотр исходного кода

feat(scripts): обязательные обновления скриптовa

Merge pull request #10 from horanchikk/feat/scripts-updates
Morozov Vadim 7 месяцев назад
Родитель
Сommit
ac6f887969
2 измененных файлов с 8 добавлено и 6 удалено
  1. 1 1
      scripts/dev.ts
  2. 7 5
      scripts/mobileBuild.ts

+ 1 - 1
scripts/dev.ts

@@ -54,7 +54,7 @@ new Listr(
       title: 'Launching server',
       task: async (_, task) => {
         const shouldStop = false
-        const cmd = spawn('node', ['node_modules/nuxi/bin/nuxi.mjs', 'dev', '--port', '3000'])
+        const cmd = spawn('node', ['node_modules/nuxt/bin/nuxt.mjs', 'dev', '--port', '3000'])
 
         task.title = 'Command spawned'
 

+ 7 - 5
scripts/mobileBuild.ts

@@ -116,8 +116,7 @@ try {
           ),
       },
       {
-        title: `Android app ${!ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0 ? '[Will be skipped]' : ''}`,
-        skip: !ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0,
+        title: `Android app`,
         task: (_, task): Listr =>
           task.newListr(
             [
@@ -173,14 +172,16 @@ try {
                 },
               },
               {
-                title: 'Setup local env',
+                title: `Setup local env ${!ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0 ? '[Will be skipped]' : ''}`,
+                skip: !ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0,
                 task: async (_, task) => {
                   await runCommand(`export PATH=${currentPath}/jdk/jdk-20/bin:$PATH && export ANDROID_SDK_ROOT=${currentPath}/sdk`)
                   task.title = 'ENV successfully setuped'
                 },
               },
               {
-                title: 'Build android project',
+                title: `Build android project ${!ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0 ? '[Will be skipped]' : ''}`,
+                skip: !ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0,
                 task: async (_, task) => {
                   task.title = 'Gradle is building project, please wait'
                   await runCommand('pnpm --package=@capacitor/cli dlx cap build android', task)
@@ -188,7 +189,8 @@ try {
                 },
               },
               {
-                title: 'Run apk',
+                title: `Run apk ${!ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0 ? '[Will be skipped]' : ''}`,
+                skip: !ANDROID_DEVICE_ID || ANDROID_DEVICE_ID.length === 0,
                 task: async (_, task) => {
                   task.title = `Running app on device ${ANDROID_DEVICE_ID}`
                   await runCommand(`pnpm --package=@capacitor/cli dlx cap run android --no-sync --target ${ANDROID_DEVICE_ID}`, task)