WIP

Author: graygilmore

dist/index.js

@@ -1,52 +1,42 @@
-import * as core from '@actions/core';
-import { installCli } from './steps/installCli';
-import { runChecksJson } from './steps/runChecksJson';
-import { runChecksText } from './steps/runChecksText';
-import { getConfigContents } from './steps/getConfigContents';
-import { getFileDiff } from './steps/getFileDiff';
-import { addAnnotations } from './addAnnotations';
-import * as semver from 'semver';
+import * as core from "@actions/core";
+import { installCli } from "./steps/installCli";
+import { runChecksJson } from "./steps/runChecksJson";
+import { runChecksText } from "./steps/runChecksText";
+import { getConfigContents } from "./steps/getConfigContents";
+import { getFileDiff } from "./steps/getFileDiff";
+import { addAnnotations } from "./addAnnotations";
+import * as semver from "semver";
 
 async function run() {
   const cwd = process.cwd();
   const shopifyExecutable = `${cwd}/node_modules/.bin/shopify`;
 
   // This is mockable with process.env.INPUT_ALL_CAPS_NAME
-  const themeRoot = core.getInput('theme_root') || cwd;
-  const version = core.getInput('version') || '';
-  const flags = core.getInput('flags') || '';
-  const ghToken = core.getInput('token');
-  const base = core.getInput('base');
+  const themeRoot = core.getInput("theme_root") || cwd;
+  const version = core.getInput("version") || "";
+  const flags = core.getInput("flags") || "";
+  const ghToken = core.getInput("token");
+  const base = core.getInput("base");
   const devPreview = requiresDevPreview(version);
 
   try {
     await installCli(version);
     if (ghToken) {
-      const [{ report, exitCode }, configContent, fileDiff] =
-        await Promise.all([
-          runChecksJson(
-            themeRoot,
-            shopifyExecutable,
-            devPreview,
-            flags,
-          ),
+      const [{ report, exitCode }, configContent, fileDiff] = await Promise.all(
+        [
+          runChecksJson(themeRoot, shopifyExecutable, devPreview, flags),
           getConfigContents(themeRoot, shopifyExecutable, devPreview),
           getFileDiff(base, cwd),
-        ]);
-      await addAnnotations(
-        report,
-        exitCode,
-        configContent,
-        ghToken,
-        fileDiff,
+        ]
       );
+      await addAnnotations(report, exitCode, configContent, ghToken, fileDiff);
       process.exit(exitCode);
     } else {
       const { exitCode } = await runChecksText(
         themeRoot,
         shopifyExecutable,
         devPreview,
-        flags,
+        flags
       );
       process.exit(exitCode);
     }
@@ -58,9 +48,7 @@ async function run() {
 
 function requiresDevPreview(version: string) {
   return (
-    !!version &&
-    semver.gte(version, '3.50.0') &&
-    semver.lt(version, '3.55.0')
+    !!version && semver.gte(version, "3.50.0") && semver.lt(version, "3.55.0")
   );
 }
 

src/index.ts

@@ -1,34 +1,35 @@
-import { exec } from '@actions/exec';
-import * as semver from 'semver';
+import { exec } from "@actions/exec";
+import * as semver from "semver";
+import { runChecksJson } from "./runChecksJson";
 
-const MIN_VERSION = '3.50.0';
-const MAX_THEME_VERSION = '3.59.0';
+const MIN_VERSION = "3.50.0";
+const MAX_THEME_VERSION = "3.59.0";
 
 export async function installCli(version?: string) {
-  const versionSuffix = version ? `@${version}` : '';
+  const versionSuffix = version ? `@${version}` : "";
 
   if (!isValidVersion(version)) {
     throw new Error(
-      `Shopify CLI version: ${version} is invalid or smaller than ${MIN_VERSION}`,
+      `Shopify CLI version: ${version} is invalid or smaller than ${MIN_VERSION}`
     );
   }
 
+  const waiting = await exec(`npm list shopify`);
+  console.log({ waiting });
   await exec(
-    'npm',
+    "npm",
     [
-      'install',
-      '--no-package-lock',
-      '--no-save',
+      "install",
+      "--no-package-lock",
+      "--no-save",
       `@shopify/cli${versionSuffix}`,
-      shouldIncludeTheme(version)
-        ? `@shopify/theme${versionSuffix}`
-        : '',
-    ].filter(Boolean),
+      shouldIncludeTheme(version) ? `@shopify/theme${versionSuffix}` : "",
+    ].filter(Boolean)
   );
 }
 
 function shouldIncludeTheme(version?: string) {
-  if (!version || version.includes('experimental')) {
+  if (!version || version.includes("experimental")) {
     return false;
   }
 
@@ -47,7 +48,7 @@ function shouldIncludeTheme(version?: string) {
 }
 
 function isValidVersion(version?: string): boolean {
-  if (!version || version.includes('experimental')) {
+  if (!version || version.includes("experimental")) {
     return true;
   }