@shopify/cli-hydrogen 3.37.0 → 3.39.0

package/dist/cli/commands/hydrogen/deploy.js

@@ -1,16 +1,16 @@
 import { hydrogenFlags } from '../../flags.js';
 import { deployToOxygen } from '../../services/deploy.js';
-import { output } from '@shopify/cli-kit';
 import Command from '@shopify/cli-kit/node/base-command';
 import { Flags } from '@oclif/core';
 import { isShopify } from '@shopify/cli-kit/node/environment/local';
 import { globalFlags } from '@shopify/cli-kit/node/cli';
 import { resolvePath, cwd } from '@shopify/cli-kit/node/path';
+import { outputWarn } from '@shopify/cli-kit/node/output';
 export default class Deploy extends Command {
     async run() {
         const isShopifolk = await isShopify();
         if (!isShopifolk) {
-            output.warn('Command coming soon...');
+            outputWarn('Command coming soon...');
             return;
         }
         const { flags } = await this.parse(Deploy);

package/dist/cli/commands/hydrogen/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/cli/commands/hydrogen/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AACvC,OAAO,OAAO,MAAM,oCAAoC,CAAA;AACxD,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,yCAAyC,CAAA;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAC,WAAW,EAAE,GAAG,EAAC,MAAM,4BAA4B,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,OAAO;IA2ClC,KAAK,CAAC,GAAG;QACd,MAAM,WAAW,GAAG,MAAM,SAAS,EAAE,CAAA;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAA;YACrC,OAAM;SACP;QAED,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QAExD,MAAM,cAAc,CAAC,EAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,CAAC,CAAA;IAC7C,CAAC;;AArDM,kBAAW,GAAG,4CAA4C,CAAA;AAC1D,aAAM,GAAG,IAAI,CAAA;AAEb,YAAK,GAAG;IACb,GAAG,WAAW;IACd,GAAG,aAAa;IAChB,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;QAC5B,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,wCAAwC;QAC7C,WAAW,EAAE,uCAAuC;KACrD,CAAC;IACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;QAC1B,GAAG,EAAE,sCAAsC;QAC3C,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;QACzB,GAAG,EAAE,qCAAqC;QAC1C,WAAW,EAAE,yCAAyC;KACvD,CAAC;IACF,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;QACxB,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,qCAAqC;QAC1C,WAAW,EAAE,oDAAoD;KAClE,CAAC;IACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;QACzB,GAAG,EAAE,oCAAoC;QACzC,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,wDAAwD;KACtE,CAAC;IACF,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,GAAG,EAAE,kCAAkC;QACvC,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,4FAA4F;KAC1G,CAAC;IACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;QAC1B,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,sCAAsC;QAC3C,OAAO,EAAE,6BAA6B;KACvC,CAAC;CACH,CAAA","sourcesContent":["import {hydrogenFlags} from '../../flags.js'\nimport {deployToOxygen} from '../../services/deploy.js'\nimport {output} from '@shopify/cli-kit'\nimport Command from '@shopify/cli-kit/node/base-command'\nimport {Flags} from '@oclif/core'\nimport {isShopify} from '@shopify/cli-kit/node/environment/local'\nimport {globalFlags} from '@shopify/cli-kit/node/cli'\nimport {resolvePath, cwd} from '@shopify/cli-kit/node/path'\n\nexport default class Deploy extends Command {\n  static description = 'Deploy your Hydrogen app to Oxygen hosting'\n  static hidden = true\n\n  static flags = {\n    ...globalFlags,\n    ...hydrogenFlags,\n    deploymentToken: Flags.string({\n      required: true,\n      env: 'SHOPIFY_HYDROGEN_FLAG_DEPLOYMENT_TOKEN',\n      description: 'Specify your Oxygen deployment token.',\n    }),\n    commitMessage: Flags.string({\n      env: 'SHOPIFY_HYDROGEN_FLAG_COMMIT_MESSAGE',\n      description: 'Override the default Git commit message.',\n    }),\n    commitAuthor: Flags.string({\n      env: 'SHOPIFY_HYDROGEN_FLAG_COMMIT_AUTHOR',\n      description: 'Override the default Git commit author.',\n    }),\n    pathToBuild: Flags.string({\n      hidden: true,\n      env: 'SHOPIFY_HYDROGEN_FLAG_PATH_TO_BUILD',\n      description: 'Skip build process and use provided value as build',\n    }),\n    healthCheck: Flags.boolean({\n      env: 'SHOPIFY_HYDROGEN_FLAG_HEALTH_CHECK',\n      default: true,\n      description: 'Require a health check before the deployment succeeds.',\n    }),\n    assumeYes: Flags.boolean({\n      char: 'y',\n      env: 'SHOPIFY_HYDROGEN_FLAG_ASSUME_YES',\n      default: false,\n      description: 'Automatic yes to prompts. Assume \"yes\" as answer to all prompts and run non-interactively.',\n    }),\n    oxygenAddress: Flags.string({\n      hidden: true,\n      env: 'SHOPIFY_HYDROGEN_FLAG_OXYGEN_ADDRESS',\n      default: 'oxygen-dms.shopifycloud.com',\n    }),\n  }\n\n  public async run(): Promise<void> {\n    const isShopifolk = await isShopify()\n    if (!isShopifolk) {\n      output.warn('Command coming soon...')\n      return\n    }\n\n    const {flags} = await this.parse(Deploy)\n    const dir = flags.path ? resolvePath(flags.path) : cwd()\n\n    await deployToOxygen({...flags, path: dir})\n  }\n}\n"]}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/cli/commands/hydrogen/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAA;AACvD,OAAO,OAAO,MAAM,oCAAoC,CAAA;AACxD,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,yCAAyC,CAAA;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAC,WAAW,EAAE,GAAG,EAAC,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAA;AAEvD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,OAAO;IA2ClC,KAAK,CAAC,GAAG;QACd,MAAM,WAAW,GAAG,MAAM,SAAS,EAAE,CAAA;QACrC,IAAI,CAAC,WAAW,EAAE;YAChB,UAAU,CAAC,wBAAwB,CAAC,CAAA;YACpC,OAAM;SACP;QAED,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QAExD,MAAM,cAAc,CAAC,EAAC,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,CAAC,CAAA;IAC7C,CAAC;;AArDM,kBAAW,GAAG,4CAA4C,CAAA;AAC1D,aAAM,GAAG,IAAI,CAAA;AAEb,YAAK,GAAG;IACb,GAAG,WAAW;IACd,GAAG,aAAa;IAChB,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;QAC5B,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,wCAAwC;QAC7C,WAAW,EAAE,uCAAuC;KACrD,CAAC;IACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;QAC1B,GAAG,EAAE,sCAAsC;QAC3C,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACF,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;QACzB,GAAG,EAAE,qCAAqC;QAC1C,WAAW,EAAE,yCAAyC;KACvD,CAAC;IACF,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;QACxB,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,qCAAqC;QAC1C,WAAW,EAAE,oDAAoD;KAClE,CAAC;IACF,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;QACzB,GAAG,EAAE,oCAAoC;QACzC,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,wDAAwD;KACtE,CAAC;IACF,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,GAAG,EAAE,kCAAkC;QACvC,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,4FAA4F;KAC1G,CAAC;IACF,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;QAC1B,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,sCAAsC;QAC3C,OAAO,EAAE,6BAA6B;KACvC,CAAC;CACH,CAAA","sourcesContent":["import {hydrogenFlags} from '../../flags.js'\nimport {deployToOxygen} from '../../services/deploy.js'\nimport Command from '@shopify/cli-kit/node/base-command'\nimport {Flags} from '@oclif/core'\nimport {isShopify} from '@shopify/cli-kit/node/environment/local'\nimport {globalFlags} from '@shopify/cli-kit/node/cli'\nimport {resolvePath, cwd} from '@shopify/cli-kit/node/path'\nimport {outputWarn} from '@shopify/cli-kit/node/output'\n\nexport default class Deploy extends Command {\n  static description = 'Deploy your Hydrogen app to Oxygen hosting'\n  static hidden = true\n\n  static flags = {\n    ...globalFlags,\n    ...hydrogenFlags,\n    deploymentToken: Flags.string({\n      required: true,\n      env: 'SHOPIFY_HYDROGEN_FLAG_DEPLOYMENT_TOKEN',\n      description: 'Specify your Oxygen deployment token.',\n    }),\n    commitMessage: Flags.string({\n      env: 'SHOPIFY_HYDROGEN_FLAG_COMMIT_MESSAGE',\n      description: 'Override the default Git commit message.',\n    }),\n    commitAuthor: Flags.string({\n      env: 'SHOPIFY_HYDROGEN_FLAG_COMMIT_AUTHOR',\n      description: 'Override the default Git commit author.',\n    }),\n    pathToBuild: Flags.string({\n      hidden: true,\n      env: 'SHOPIFY_HYDROGEN_FLAG_PATH_TO_BUILD',\n      description: 'Skip build process and use provided value as build',\n    }),\n    healthCheck: Flags.boolean({\n      env: 'SHOPIFY_HYDROGEN_FLAG_HEALTH_CHECK',\n      default: true,\n      description: 'Require a health check before the deployment succeeds.',\n    }),\n    assumeYes: Flags.boolean({\n      char: 'y',\n      env: 'SHOPIFY_HYDROGEN_FLAG_ASSUME_YES',\n      default: false,\n      description: 'Automatic yes to prompts. Assume \"yes\" as answer to all prompts and run non-interactively.',\n    }),\n    oxygenAddress: Flags.string({\n      hidden: true,\n      env: 'SHOPIFY_HYDROGEN_FLAG_OXYGEN_ADDRESS',\n      default: 'oxygen-dms.shopifycloud.com',\n    }),\n  }\n\n  public async run(): Promise<void> {\n    const isShopifolk = await isShopify()\n    if (!isShopifolk) {\n      outputWarn('Command coming soon...')\n      return\n    }\n\n    const {flags} = await this.parse(Deploy)\n    const dir = flags.path ? resolvePath(flags.path) : cwd()\n\n    await deployToOxygen({...flags, path: dir})\n  }\n}\n"]}

package/dist/cli/commands/hydrogen/info.js

@@ -3,15 +3,15 @@ import { load as loadApp } from '../../models/hydrogen.js';
 import { hydrogenFlags } from '../../flags.js';
 import { Flags } from '@oclif/core';
 import { globalFlags } from '@shopify/cli-kit/node/cli';
-import { output } from '@shopify/cli-kit';
 import Command from '@shopify/cli-kit/node/base-command';
 import { resolvePath, cwd } from '@shopify/cli-kit/node/path';
+import { outputInfo } from '@shopify/cli-kit/node/output';
 export default class Info extends Command {
     async run() {
         const { flags } = await this.parse(Info);
         const directory = flags.path ? resolvePath(flags.path) : cwd();
         const app = await loadApp(directory);
-        output.info(info(app, { showPrivateData: flags.showToken }));
+        outputInfo(info(app, { showPrivateData: flags.showToken }));
         if (app.errors)
             process.exit(2);
     }

package/dist/cli/commands/hydrogen/info.js.map

@@ -1 +1 @@
-{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../src/cli/commands/hydrogen/info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAC,IAAI,IAAI,OAAO,EAAc,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAA;AACvC,OAAO,OAAO,MAAM,oCAAoC,CAAA;AACxD,OAAO,EAAC,WAAW,EAAE,GAAG,EAAC,MAAM,4BAA4B,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IAchC,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACtC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QAC9D,MAAM,GAAG,GAAgB,MAAM,OAAO,CAAC,SAAS,CAAC,CAAA;QAEjD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,eAAe,EAAE,KAAK,CAAC,SAAS,EAAC,CAAC,CAAC,CAAA;QAC1D,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjC,CAAC;;AApBM,gBAAW,GAAG,kDAAkD,CAAA;AAEhE,UAAK,GAAG;IACb,GAAG,WAAW;IACd,GAAG,aAAa;IAChB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,2BAA2B;QACxC,OAAO,EAAE,KAAK;QACd,GAAG,EAAE,kCAAkC;KACxC,CAAC;CACH,CAAA","sourcesContent":["import {info} from '../../services/info.js'\nimport {load as loadApp, HydrogenApp} from '../../models/hydrogen.js'\nimport {hydrogenFlags} from '../../flags.js'\nimport {Flags} from '@oclif/core'\nimport {globalFlags} from '@shopify/cli-kit/node/cli'\nimport {output} from '@shopify/cli-kit'\nimport Command from '@shopify/cli-kit/node/base-command'\nimport {resolvePath, cwd} from '@shopify/cli-kit/node/path'\n\nexport default class Info extends Command {\n  static description = 'Print basic information about your hydrogen app.'\n\n  static flags = {\n    ...globalFlags,\n    ...hydrogenFlags,\n    showToken: Flags.boolean({\n      hidden: false,\n      description: 'Show storefront API token',\n      default: false,\n      env: 'SHOPIFY_HYDROGEN_FLAG_SHOW_TOKEN',\n    }),\n  }\n\n  public async run(): Promise<void> {\n    const {flags} = await this.parse(Info)\n    const directory = flags.path ? resolvePath(flags.path) : cwd()\n    const app: HydrogenApp = await loadApp(directory)\n\n    output.info(info(app, {showPrivateData: flags.showToken}))\n    if (app.errors) process.exit(2)\n  }\n}\n"]}
+{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../src/cli/commands/hydrogen/info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAC,IAAI,IAAI,OAAO,EAAc,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AACjC,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAA;AACrD,OAAO,OAAO,MAAM,oCAAoC,CAAA;AACxD,OAAO,EAAC,WAAW,EAAE,GAAG,EAAC,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAA;AAEvD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IAchC,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACtC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QAC9D,MAAM,GAAG,GAAgB,MAAM,OAAO,CAAC,SAAS,CAAC,CAAA;QAEjD,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,EAAC,eAAe,EAAE,KAAK,CAAC,SAAS,EAAC,CAAC,CAAC,CAAA;QACzD,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjC,CAAC;;AApBM,gBAAW,GAAG,kDAAkD,CAAA;AAEhE,UAAK,GAAG;IACb,GAAG,WAAW;IACd,GAAG,aAAa;IAChB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;QACvB,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,2BAA2B;QACxC,OAAO,EAAE,KAAK;QACd,GAAG,EAAE,kCAAkC;KACxC,CAAC;CACH,CAAA","sourcesContent":["import {info} from '../../services/info.js'\nimport {load as loadApp, HydrogenApp} from '../../models/hydrogen.js'\nimport {hydrogenFlags} from '../../flags.js'\nimport {Flags} from '@oclif/core'\nimport {globalFlags} from '@shopify/cli-kit/node/cli'\nimport Command from '@shopify/cli-kit/node/base-command'\nimport {resolvePath, cwd} from '@shopify/cli-kit/node/path'\nimport {outputInfo} from '@shopify/cli-kit/node/output'\n\nexport default class Info extends Command {\n  static description = 'Print basic information about your hydrogen app.'\n\n  static flags = {\n    ...globalFlags,\n    ...hydrogenFlags,\n    showToken: Flags.boolean({\n      hidden: false,\n      description: 'Show storefront API token',\n      default: false,\n      env: 'SHOPIFY_HYDROGEN_FLAG_SHOW_TOKEN',\n    }),\n  }\n\n  public async run(): Promise<void> {\n    const {flags} = await this.parse(Info)\n    const directory = flags.path ? resolvePath(flags.path) : cwd()\n    const app: HydrogenApp = await loadApp(directory)\n\n    outputInfo(info(app, {showPrivateData: flags.showToken}))\n    if (app.errors) process.exit(2)\n  }\n}\n"]}

package/dist/cli/services/build/check-lockfile.d.ts

@@ -1,3 +1,3 @@
-declare type LockFileStatus = 'missing' | 'multiple' | 'ignored' | 'ok';
+type LockFileStatus = 'missing' | 'multiple' | 'ignored' | 'ok';
 export declare function checkLockfileStatus(directory: string): Promise<LockFileStatus>;
 export {};

package/dist/cli/services/build/check-lockfile.js

@@ -1,7 +1,7 @@
 import { renderWarning } from '@shopify/cli-kit/node/ui';
 import { lockfiles } from '@shopify/cli-kit/node/node-package-manager';
 import { fileExists } from '@shopify/cli-kit/node/fs';
-import { gitFactory } from '@shopify/cli-kit/node/git';
+import { checkIfIgnoredInGitRepository } from '@shopify/cli-kit/node/git';
 import { resolvePath } from '@shopify/cli-kit/node/path';
 function missingLockfileWarning() {
     renderWarning({
@@ -70,9 +70,8 @@ export async function checkLockfileStatus(directory) {
         multipleLockfilesWarning(availableLockfiles);
         return 'multiple';
     }
-    const repo = gitFactory(directory);
     const lockfile = availableLockfiles[0];
-    const ignoredLockfile = await repo.checkIgnore([lockfile]);
+    const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [lockfile]);
     if (ignoredLockfile.length) {
         lockfileIgnoredWarning(lockfile);
         return 'ignored';

package/dist/cli/services/build/check-lockfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-lockfile.js","sourceRoot":"","sources":["../../../../src/cli/services/build/check-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,4CAA4C,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAA;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAA;AAGtD,SAAS,sBAAsB;IAC7B,aAAa,CAAC;QACZ,QAAQ,EAAE,mBAAmB;QAC7B,IAAI,EACF,wEAAwE;YACxE,0EAA0E;YAC1E,gDAAgD;QAClD,SAAS,EAAE;YACT;gBACE,0BAA0B;gBAC1B;oBACE,OAAO,EAAE,uBAAuB;iBACjC;aACF;YACD,wCAAwC;SACzC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAqB;IACrD,MAAM,eAAe,GAAG;QACtB,WAAW,EAAE,MAAM;QACnB,mBAAmB,EAAE,KAAK;QAC1B,gBAAgB,EAAE,MAAM;KACzB,CAAA;IAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9C,OAAO,GAAG,QAAQ,gBAAgB,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,aAAa,CAAC;QACZ,QAAQ,EAAE,0BAA0B;QACpC,IAAI,EAAE;YACJ,uEAAuE;gBACrE,kEAAkE;gBAClE,4BAA4B;YAC9B,EAAC,IAAI,EAAE,EAAC,KAAK,EAAE,YAAY,EAAC,EAAC;SAC9B;QACD,SAAS,EAAE,CAAC,+BAA+B,EAAE,sCAAsC,CAAC;KACrF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB;IAC9C,aAAa,CAAC;QACZ,QAAQ,EAAE,yBAAyB;QACnC,IAAI,EACF,0EAA0E;YAC1E,0EAA0E;YAC1E,YAAY;QACd,SAAS,EAAE;YACT,+DAA+D,QAAQ,EAAE;YACzE,sCAAsC;SACvC;KACF,CAAC,CAAA;AACJ,CAAC;AAID,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,SAAiB;IACzD,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE;QAC5E,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QACzD,IAAI,MAAM,UAAU,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACxC;aAAM;YACL,OAAO,GAAG,CAAA;SACX;IACH,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAgB,CAAC,CAAC,CAAA;IAErC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAC9B,sBAAsB,EAAE,CAAA;QACxB,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,wBAAwB,CAAC,kBAAkB,CAAC,CAAA;QAC5C,OAAO,UAAU,CAAA;KAClB;IAED,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;IAClC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAE,CAAA;IACvC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE1D,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import {renderWarning} from '@shopify/cli-kit/node/ui'\nimport {lockfiles} from '@shopify/cli-kit/node/node-package-manager'\nimport {fileExists} from '@shopify/cli-kit/node/fs'\nimport {gitFactory} from '@shopify/cli-kit/node/git'\nimport {resolvePath} from '@shopify/cli-kit/node/path'\nimport type {Lockfile} from '@shopify/cli-kit/node/node-package-manager'\n\nfunction missingLockfileWarning() {\n  renderWarning({\n    headline: 'No lockfile found',\n    body:\n      `If you don’t commit a lockfile, then your app might install the wrong ` +\n      `package versions when deploying. To avoid versioning issues, generate a ` +\n      `new lockfile and commit it to your repository.`,\n    nextSteps: [\n      [\n        'Generate a lockfile. Run',\n        {\n          command: 'npm|yarn|pnpm install',\n        },\n      ],\n      'Commit the new file to your repository',\n    ],\n  })\n}\n\nfunction multipleLockfilesWarning(lockfiles: Lockfile[]) {\n  const packageManagers = {\n    'yarn.lock': 'yarn',\n    'package-lock.json': 'npm',\n    'pnpm-lock.yaml': 'pnpm',\n  }\n\n  const lockfileList = lockfiles.map((lockfile) => {\n    return `${lockfile} (created by ${packageManagers[lockfile]})`\n  })\n\n  renderWarning({\n    headline: 'Multiple lockfiles found',\n    body: [\n      `Your project contains more than one lockfile. This can cause version ` +\n        `conflicts when installing and deploying your app. The following ` +\n        `lockfiles were detected:\\n`,\n      {list: {items: lockfileList}},\n    ],\n    nextSteps: ['Delete any unneeded lockfiles', 'Commit the change to your repository'],\n  })\n}\n\nfunction lockfileIgnoredWarning(lockfile: string) {\n  renderWarning({\n    headline: 'Lockfile ignored by Git',\n    body:\n      `Your project’s lockfile isn’t being tracked by Git. If you don’t commit ` +\n      `a lockfile, then your app might install the wrong package versions when ` +\n      `deploying.`,\n    nextSteps: [\n      `In your project’s .gitignore file, delete any references to ${lockfile}`,\n      'Commit the change to your repository',\n    ],\n  })\n}\n\ntype LockFileStatus = 'missing' | 'multiple' | 'ignored' | 'ok'\n\nexport async function checkLockfileStatus(directory: string): Promise<LockFileStatus> {\n  const availableLockfiles = await lockfiles.reduce(async (acc, lockFileName) => {\n    const lockfilePath = resolvePath(directory, lockFileName)\n    if (await fileExists(lockfilePath)) {\n      return (await acc).concat(lockFileName)\n    } else {\n      return acc\n    }\n  }, Promise.resolve([] as Lockfile[]))\n\n  if (!availableLockfiles.length) {\n    missingLockfileWarning()\n    return 'missing'\n  }\n\n  if (availableLockfiles.length > 1) {\n    multipleLockfilesWarning(availableLockfiles)\n    return 'multiple'\n  }\n\n  const repo = gitFactory(directory)\n  const lockfile = availableLockfiles[0]!\n  const ignoredLockfile = await repo.checkIgnore([lockfile])\n\n  if (ignoredLockfile.length) {\n    lockfileIgnoredWarning(lockfile)\n    return 'ignored'\n  }\n\n  return 'ok'\n}\n"]}
+{"version":3,"file":"check-lockfile.js","sourceRoot":"","sources":["../../../../src/cli/services/build/check-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,4CAA4C,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAC,6BAA6B,EAAC,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAA;AAGtD,SAAS,sBAAsB;IAC7B,aAAa,CAAC;QACZ,QAAQ,EAAE,mBAAmB;QAC7B,IAAI,EACF,wEAAwE;YACxE,0EAA0E;YAC1E,gDAAgD;QAClD,SAAS,EAAE;YACT;gBACE,0BAA0B;gBAC1B;oBACE,OAAO,EAAE,uBAAuB;iBACjC;aACF;YACD,wCAAwC;SACzC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAqB;IACrD,MAAM,eAAe,GAAG;QACtB,WAAW,EAAE,MAAM;QACnB,mBAAmB,EAAE,KAAK;QAC1B,gBAAgB,EAAE,MAAM;KACzB,CAAA;IAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9C,OAAO,GAAG,QAAQ,gBAAgB,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,aAAa,CAAC;QACZ,QAAQ,EAAE,0BAA0B;QACpC,IAAI,EAAE;YACJ,uEAAuE;gBACrE,kEAAkE;gBAClE,4BAA4B;YAC9B,EAAC,IAAI,EAAE,EAAC,KAAK,EAAE,YAAY,EAAC,EAAC;SAC9B;QACD,SAAS,EAAE,CAAC,+BAA+B,EAAE,sCAAsC,CAAC;KACrF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB;IAC9C,aAAa,CAAC;QACZ,QAAQ,EAAE,yBAAyB;QACnC,IAAI,EACF,0EAA0E;YAC1E,0EAA0E;YAC1E,YAAY;QACd,SAAS,EAAE;YACT,+DAA+D,QAAQ,EAAE;YACzE,sCAAsC;SACvC;KACF,CAAC,CAAA;AACJ,CAAC;AAID,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,SAAiB;IACzD,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE;QAC5E,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QACzD,IAAI,MAAM,UAAU,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACxC;aAAM;YACL,OAAO,GAAG,CAAA;SACX;IACH,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAgB,CAAC,CAAC,CAAA;IAErC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAC9B,sBAAsB,EAAE,CAAA;QACxB,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,wBAAwB,CAAC,kBAAkB,CAAC,CAAA;QAC5C,OAAO,UAAU,CAAA;KAClB;IAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAE,CAAA;IACvC,MAAM,eAAe,GAAG,MAAM,6BAA6B,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAElF,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import {renderWarning} from '@shopify/cli-kit/node/ui'\nimport {lockfiles} from '@shopify/cli-kit/node/node-package-manager'\nimport {fileExists} from '@shopify/cli-kit/node/fs'\nimport {checkIfIgnoredInGitRepository} from '@shopify/cli-kit/node/git'\nimport {resolvePath} from '@shopify/cli-kit/node/path'\nimport type {Lockfile} from '@shopify/cli-kit/node/node-package-manager'\n\nfunction missingLockfileWarning() {\n  renderWarning({\n    headline: 'No lockfile found',\n    body:\n      `If you don’t commit a lockfile, then your app might install the wrong ` +\n      `package versions when deploying. To avoid versioning issues, generate a ` +\n      `new lockfile and commit it to your repository.`,\n    nextSteps: [\n      [\n        'Generate a lockfile. Run',\n        {\n          command: 'npm|yarn|pnpm install',\n        },\n      ],\n      'Commit the new file to your repository',\n    ],\n  })\n}\n\nfunction multipleLockfilesWarning(lockfiles: Lockfile[]) {\n  const packageManagers = {\n    'yarn.lock': 'yarn',\n    'package-lock.json': 'npm',\n    'pnpm-lock.yaml': 'pnpm',\n  }\n\n  const lockfileList = lockfiles.map((lockfile) => {\n    return `${lockfile} (created by ${packageManagers[lockfile]})`\n  })\n\n  renderWarning({\n    headline: 'Multiple lockfiles found',\n    body: [\n      `Your project contains more than one lockfile. This can cause version ` +\n        `conflicts when installing and deploying your app. The following ` +\n        `lockfiles were detected:\\n`,\n      {list: {items: lockfileList}},\n    ],\n    nextSteps: ['Delete any unneeded lockfiles', 'Commit the change to your repository'],\n  })\n}\n\nfunction lockfileIgnoredWarning(lockfile: string) {\n  renderWarning({\n    headline: 'Lockfile ignored by Git',\n    body:\n      `Your project’s lockfile isn’t being tracked by Git. If you don’t commit ` +\n      `a lockfile, then your app might install the wrong package versions when ` +\n      `deploying.`,\n    nextSteps: [\n      `In your project’s .gitignore file, delete any references to ${lockfile}`,\n      'Commit the change to your repository',\n    ],\n  })\n}\n\ntype LockFileStatus = 'missing' | 'multiple' | 'ignored' | 'ok'\n\nexport async function checkLockfileStatus(directory: string): Promise<LockFileStatus> {\n  const availableLockfiles = await lockfiles.reduce(async (acc, lockFileName) => {\n    const lockfilePath = resolvePath(directory, lockFileName)\n    if (await fileExists(lockfilePath)) {\n      return (await acc).concat(lockFileName)\n    } else {\n      return acc\n    }\n  }, Promise.resolve([] as Lockfile[]))\n\n  if (!availableLockfiles.length) {\n    missingLockfileWarning()\n    return 'missing'\n  }\n\n  if (availableLockfiles.length > 1) {\n    multipleLockfilesWarning(availableLockfiles)\n    return 'multiple'\n  }\n\n  const lockfile = availableLockfiles[0]!\n  const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [lockfile])\n\n  if (ignoredLockfile.length) {\n    lockfileIgnoredWarning(lockfile)\n    return 'ignored'\n  }\n\n  return 'ok'\n}\n"]}

package/dist/cli/services/build.d.ts

@@ -1,5 +1,4 @@
-import { ui } from '@shopify/cli-kit';
-declare type Target = 'node' | 'client' | 'worker';
+type Target = 'node' | 'client' | 'worker';
 interface DevOptions {
     directory: string;
     targets: {
@@ -9,6 +8,9 @@ interface DevOptions {
     assetBaseURL?: string;
     verbose?: boolean;
 }
-export declare function buildTaskList({ directory, targets, base, assetBaseURL, verbose }: DevOptions): ui.ListrTask[];
+export declare function buildTaskList({ directory, targets, base, assetBaseURL, verbose }: DevOptions): {
+    title: string;
+    task: () => Promise<void>;
+}[];
 export declare function build(options: DevOptions): Promise<void>;
 export {};

package/dist/cli/services/build.js

@@ -1,15 +1,14 @@
 import { checkLockfileStatus } from './build/check-lockfile.js';
 import { build as viteBuild } from 'vite';
-import { ui } from '@shopify/cli-kit';
-import { isUnitTest } from '@shopify/cli-kit/node/environment/local';
 import { AbortError } from '@shopify/cli-kit/node/error';
+import { renderTasks } from '@shopify/cli-kit/node/ui';
 export function buildTaskList({ directory, targets, base, assetBaseURL, verbose }) {
     const commonConfig = { base, root: directory };
     return Object.entries(targets)
         .filter(([_, value]) => value)
         .map(([key, value]) => ({
         title: `Building ${key} code`,
-        task: async (_, task) => {
+        task: async () => {
             if (key === 'worker') {
                 process.env.WORKER = 'true';
             }
@@ -33,14 +32,12 @@ export function buildTaskList({ directory, targets, base, assetBaseURL, verbose
                 abortError.stack = error.stack;
                 throw abortError;
             }
-            task.title = `Built ${key} code`;
         },
     }));
 }
 export async function build(options) {
     await checkLockfileStatus(options.directory);
     const tasks = await buildTaskList(options);
-    const list = ui.newListr(tasks, { rendererSilent: isUnitTest() });
-    await list.run();
+    await renderTasks(tasks);
 }
 //# sourceMappingURL=build.js.map

package/dist/cli/services/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/cli/services/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAC,KAAK,IAAI,SAAS,EAAC,MAAM,MAAM,CAAA;AACvC,OAAO,EAAC,EAAE,EAAC,MAAM,kBAAkB,CAAA;AACnC,OAAO,EAAC,UAAU,EAAC,MAAM,yCAAyC,CAAA;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAA;AAYtD,MAAM,UAAU,aAAa,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAa;IACzF,MAAM,YAAY,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,CAAA;IAE5C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;SAC7B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,KAAK,EAAE,YAAY,GAAG,OAAO;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;YACtB,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;aAC5B;YACD,IAAI,YAAY,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,YAAY,CAAA;aACnD;YAED,IAAI;gBACF,MAAM,SAAS,CAAC;oBACd,GAAG,YAAY;oBACf,KAAK,EAAE;wBACL,MAAM,EAAE,QAAQ,GAAG,EAAE;wBACrB,GAAG,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;wBAClD,QAAQ,EAAE,GAAG,KAAK,QAAQ;qBAC3B;oBACD,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;iBACtC,CAAC,CAAA;gBACF,8DAA8D;aAC/D;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAChD,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;gBAC9B,MAAM,UAAU,CAAA;aACjB;YAED,IAAI,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAA;QAClC,CAAC;KACF,CAAC,CAAC,CAAA;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAmB;IAC7C,MAAM,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAE5C,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAA;IAE1C,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAC,cAAc,EAAE,UAAU,EAAE,EAAC,CAAC,CAAA;IAE/D,MAAM,IAAI,CAAC,GAAG,EAAE,CAAA;AAClB,CAAC","sourcesContent":["import {checkLockfileStatus} from './build/check-lockfile.js'\nimport {build as viteBuild} from 'vite'\nimport {ui} from '@shopify/cli-kit'\nimport {isUnitTest} from '@shopify/cli-kit/node/environment/local'\nimport {AbortError} from '@shopify/cli-kit/node/error'\n\ntype Target = 'node' | 'client' | 'worker'\n\ninterface DevOptions {\n  directory: string\n  targets: {[key in Target]: boolean | string}\n  base?: string\n  assetBaseURL?: string\n  verbose?: boolean\n}\n\nexport function buildTaskList({directory, targets, base, assetBaseURL, verbose}: DevOptions): ui.ListrTask[] {\n  const commonConfig = {base, root: directory}\n\n  return Object.entries(targets)\n    .filter(([_, value]) => value)\n    .map(([key, value]) => ({\n      title: `Building ${key} code`,\n      task: async (_, task) => {\n        if (key === 'worker') {\n          process.env.WORKER = 'true'\n        }\n        if (assetBaseURL) {\n          process.env.HYDROGEN_ASSET_BASE_URL = assetBaseURL\n        }\n\n        try {\n          await viteBuild({\n            ...commonConfig,\n            build: {\n              outDir: `dist/${key}`,\n              ssr: typeof value === 'string' ? value : undefined,\n              manifest: key === 'client',\n            },\n            logLevel: verbose ? 'info' : 'silent',\n          })\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        } catch (error: any) {\n          const abortError = new AbortError(error.message)\n          abortError.stack = error.stack\n          throw abortError\n        }\n\n        task.title = `Built ${key} code`\n      },\n    }))\n}\n\nexport async function build(options: DevOptions) {\n  await checkLockfileStatus(options.directory)\n\n  const tasks = await buildTaskList(options)\n\n  const list = ui.newListr(tasks, {rendererSilent: isUnitTest()})\n\n  await list.run()\n}\n"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/cli/services/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAC,KAAK,IAAI,SAAS,EAAC,MAAM,MAAM,CAAA;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAA;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAA;AAYpD,MAAM,UAAU,aAAa,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAa;IACzF,MAAM,YAAY,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,CAAA;IAE5C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;SAC7B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,KAAK,EAAE,YAAY,GAAG,OAAO;QAC7B,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;aAC5B;YACD,IAAI,YAAY,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,YAAY,CAAA;aACnD;YAED,IAAI;gBACF,MAAM,SAAS,CAAC;oBACd,GAAG,YAAY;oBACf,KAAK,EAAE;wBACL,MAAM,EAAE,QAAQ,GAAG,EAAE;wBACrB,GAAG,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;wBAClD,QAAQ,EAAE,GAAG,KAAK,QAAQ;qBAC3B;oBACD,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;iBACtC,CAAC,CAAA;gBACF,8DAA8D;aAC/D;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAChD,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;gBAC9B,MAAM,UAAU,CAAA;aACjB;QACH,CAAC;KACF,CAAC,CAAC,CAAA;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAmB;IAC7C,MAAM,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAE5C,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAA;IAE1C,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC","sourcesContent":["import {checkLockfileStatus} from './build/check-lockfile.js'\nimport {build as viteBuild} from 'vite'\nimport {AbortError} from '@shopify/cli-kit/node/error'\nimport {renderTasks} from '@shopify/cli-kit/node/ui'\n\ntype Target = 'node' | 'client' | 'worker'\n\ninterface DevOptions {\n  directory: string\n  targets: {[key in Target]: boolean | string}\n  base?: string\n  assetBaseURL?: string\n  verbose?: boolean\n}\n\nexport function buildTaskList({directory, targets, base, assetBaseURL, verbose}: DevOptions) {\n  const commonConfig = {base, root: directory}\n\n  return Object.entries(targets)\n    .filter(([_, value]) => value)\n    .map(([key, value]) => ({\n      title: `Building ${key} code`,\n      task: async () => {\n        if (key === 'worker') {\n          process.env.WORKER = 'true'\n        }\n        if (assetBaseURL) {\n          process.env.HYDROGEN_ASSET_BASE_URL = assetBaseURL\n        }\n\n        try {\n          await viteBuild({\n            ...commonConfig,\n            build: {\n              outDir: `dist/${key}`,\n              ssr: typeof value === 'string' ? value : undefined,\n              manifest: key === 'client',\n            },\n            logLevel: verbose ? 'info' : 'silent',\n          })\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        } catch (error: any) {\n          const abortError = new AbortError(error.message)\n          abortError.stack = error.stack\n          throw abortError\n        }\n      },\n    }))\n}\n\nexport async function build(options: DevOptions) {\n  await checkLockfileStatus(options.directory)\n\n  const tasks = await buildTaskList(options)\n\n  await renderTasks(tasks)\n}\n"]}

package/dist/cli/services/deploy/types.d.ts

@@ -11,7 +11,7 @@ export interface DeployConfig {
     commitRef?: string;
     timestamp?: string;
 }
-export declare type ReqDeployConfig = Required<DeployConfig>;
+export type ReqDeployConfig = Required<DeployConfig>;
 export interface OxygenError {
     code: string;
     unrecoverable: boolean;

package/dist/cli/services/deploy/upload.js

@@ -40,7 +40,10 @@ export const uploadDeployment = async (config, deploymentID) => {
     await inTemporaryDirectory(async (tmpDir) => {
         const distPath = config.pathToBuild ? config.pathToBuild : `${config.path}/dist`;
         const distZipPath = `${tmpDir}/dist.zip`;
-        await zip(distPath, distZipPath);
+        await zip({
+            inputDirectory: distPath,
+            outputZipPath: distZipPath,
+        });
         const form = formData();
         form.append('operations', buildOperationsString(deploymentID));
         form.append('map', JSON.stringify({ '0': ['variables.file'] }));

package/dist/cli/services/deploy/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/cli/services/deploy/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import {ReqDeployConfig, UploadDeploymentResponse} from './types.js'\nimport {\n  CreateDeploymentResponse,\n  CreateDeploymentQuerySchema,\n  CreateDeploymentQuery,\n} from './graphql/create_deployment.js'\nimport {UploadDeploymentQuery} from './graphql/upload_deployment.js'\nimport {zip} from '@shopify/cli-kit/node/archiver'\nimport {ClientError} from 'graphql-request'\nimport {uploadOxygenDeploymentFile, oxygenRequest} from '@shopify/cli-kit/node/api/oxygen'\nimport {inTemporaryDirectory, createFileReadStream} from '@shopify/cli-kit/node/fs'\nimport {fetch, formData} from '@shopify/cli-kit/node/http'\nimport {AbortError} from '@shopify/cli-kit/node/error'\n\nexport const createDeployment = async (config: ReqDeployConfig): Promise<CreateDeploymentResponse> => {\n  const variables = {\n    input: {\n      branch: config.commitRef,\n      commitHash: config.commitSha,\n      commitAuthor: config.commitAuthor,\n      commitMessage: config.commitMessage,\n      commitTimestamp: config.timestamp,\n    },\n  }\n\n  try {\n    const response: CreateDeploymentQuerySchema = await oxygenRequest(\n      config.oxygenAddress,\n      CreateDeploymentQuery,\n      config.deploymentToken,\n      variables,\n    )\n\n    if (response.createDeployment?.error) {\n      if (response.createDeployment.error.unrecoverable) {\n        throw new AbortError(`Unrecoverable: ${response.createDeployment.error.debugInfo}`)\n      }\n\n      throw new AbortError(`Failed to create deployment. ${response.createDeployment.error.debugInfo}`)\n    }\n\n    return response.createDeployment\n  } catch (error) {\n    if (error instanceof ClientError) {\n      if (error.response.status === 429) {\n        throw new AbortError(\"You've made too many requests. Please try again later\")\n      }\n    }\n\n    throw error\n  }\n}\n\nexport const uploadDeployment = async (config: ReqDeployConfig, deploymentID: string): Promise<string> => {\n  let deploymentData: UploadDeploymentResponse | undefined\n\n  await inTemporaryDirectory(async (tmpDir) => {\n    const distPath = config.pathToBuild ? config.pathToBuild : `${config.path}/dist`\n    const distZipPath = `${tmpDir}/dist.zip`\n    await zip(distPath, distZipPath)\n\n    const form = formData()\n    form.append('operations', buildOperationsString(deploymentID))\n    form.append('map', JSON.stringify({'0': ['variables.file']}))\n    form.append('0', createFileReadStream(distZipPath), {filename: distZipPath})\n\n    const response = await uploadOxygenDeploymentFile(config.oxygenAddress, config.deploymentToken, form)\n    if (!response.ok) {\n      if (response.status === 429) {\n        throw new AbortError(\"You've made too many requests. Please try again later\")\n      }\n      if (response.status !== 200 && response.status !== 202) {\n        throw new AbortError(`Failed to upload deployment. ${await response.json()}`)\n      }\n    }\n\n    deploymentData = (await response.json()) as UploadDeploymentResponse\n  })\n\n  if (!deploymentData) {\n    throw new AbortError('Failed to upload deployment.')\n  }\n  const deploymentError = deploymentData.data?.uploadDeployment?.error\n  if (deploymentError) {\n    if (deploymentError.unrecoverable) {\n      throw new AbortError(`Unrecoverable: ${deploymentError.debugInfo}`)\n    }\n\n    throw new AbortError(`Failed to upload deployment: ${deploymentError.debugInfo}`)\n  }\n\n  return deploymentData.data.uploadDeployment.deployment.previewURL\n}\n\nexport const healthCheck = async (pingUrl: string) => {\n  const url = `${pingUrl}/__health`\n  const result = await fetch(url, {method: 'GET'})\n  if (result.status !== 200) throw new AbortError('Web page not available.')\n}\n\nconst buildOperationsString = (deploymentID: string): string => {\n  return JSON.stringify({\n    query: UploadDeploymentQuery,\n    variables: {deploymentID, file: null},\n  })\n}\n"]}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/cli/services/deploy/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import {ReqDeployConfig, UploadDeploymentResponse} from './types.js'\nimport {\n  CreateDeploymentResponse,\n  CreateDeploymentQuerySchema,\n  CreateDeploymentQuery,\n} from './graphql/create_deployment.js'\nimport {UploadDeploymentQuery} from './graphql/upload_deployment.js'\nimport {zip} from '@shopify/cli-kit/node/archiver'\nimport {ClientError} from 'graphql-request'\nimport {uploadOxygenDeploymentFile, oxygenRequest} from '@shopify/cli-kit/node/api/oxygen'\nimport {inTemporaryDirectory, createFileReadStream} from '@shopify/cli-kit/node/fs'\nimport {fetch, formData} from '@shopify/cli-kit/node/http'\nimport {AbortError} from '@shopify/cli-kit/node/error'\n\nexport const createDeployment = async (config: ReqDeployConfig): Promise<CreateDeploymentResponse> => {\n  const variables = {\n    input: {\n      branch: config.commitRef,\n      commitHash: config.commitSha,\n      commitAuthor: config.commitAuthor,\n      commitMessage: config.commitMessage,\n      commitTimestamp: config.timestamp,\n    },\n  }\n\n  try {\n    const response: CreateDeploymentQuerySchema = await oxygenRequest(\n      config.oxygenAddress,\n      CreateDeploymentQuery,\n      config.deploymentToken,\n      variables,\n    )\n\n    if (response.createDeployment?.error) {\n      if (response.createDeployment.error.unrecoverable) {\n        throw new AbortError(`Unrecoverable: ${response.createDeployment.error.debugInfo}`)\n      }\n\n      throw new AbortError(`Failed to create deployment. ${response.createDeployment.error.debugInfo}`)\n    }\n\n    return response.createDeployment\n  } catch (error) {\n    if (error instanceof ClientError) {\n      if (error.response.status === 429) {\n        throw new AbortError(\"You've made too many requests. Please try again later\")\n      }\n    }\n\n    throw error\n  }\n}\n\nexport const uploadDeployment = async (config: ReqDeployConfig, deploymentID: string): Promise<string> => {\n  let deploymentData: UploadDeploymentResponse | undefined\n\n  await inTemporaryDirectory(async (tmpDir) => {\n    const distPath = config.pathToBuild ? config.pathToBuild : `${config.path}/dist`\n    const distZipPath = `${tmpDir}/dist.zip`\n    await zip({\n      inputDirectory: distPath,\n      outputZipPath: distZipPath,\n    })\n\n    const form = formData()\n    form.append('operations', buildOperationsString(deploymentID))\n    form.append('map', JSON.stringify({'0': ['variables.file']}))\n    form.append('0', createFileReadStream(distZipPath), {filename: distZipPath})\n\n    const response = await uploadOxygenDeploymentFile(config.oxygenAddress, config.deploymentToken, form)\n    if (!response.ok) {\n      if (response.status === 429) {\n        throw new AbortError(\"You've made too many requests. Please try again later\")\n      }\n      if (response.status !== 200 && response.status !== 202) {\n        throw new AbortError(`Failed to upload deployment. ${await response.json()}`)\n      }\n    }\n\n    deploymentData = (await response.json()) as UploadDeploymentResponse\n  })\n\n  if (!deploymentData) {\n    throw new AbortError('Failed to upload deployment.')\n  }\n  const deploymentError = deploymentData.data?.uploadDeployment?.error\n  if (deploymentError) {\n    if (deploymentError.unrecoverable) {\n      throw new AbortError(`Unrecoverable: ${deploymentError.debugInfo}`)\n    }\n\n    throw new AbortError(`Failed to upload deployment: ${deploymentError.debugInfo}`)\n  }\n\n  return deploymentData.data.uploadDeployment.deployment.previewURL\n}\n\nexport const healthCheck = async (pingUrl: string) => {\n  const url = `${pingUrl}/__health`\n  const result = await fetch(url, {method: 'GET'})\n  if (result.status !== 200) throw new AbortError('Web page not available.')\n}\n\nconst buildOperationsString = (deploymentID: string): string => {\n  return JSON.stringify({\n    query: UploadDeploymentQuery,\n    variables: {deploymentID, file: null},\n  })\n}\n"]}

package/dist/cli/services/deploy.d.ts

@@ -1,2 +1,2 @@
 import { DeployConfig } from './deploy/types.js';
-export declare function deployToOxygen(_config: DeployConfig): Promise<any>;
+export declare function deployToOxygen(_config: DeployConfig): Promise<void>;

package/dist/cli/services/deploy.js

@@ -1,35 +1,33 @@
 import { createDeployment, healthCheck, uploadDeployment } from './deploy/upload.js';
 import { buildTaskList } from './build.js';
 import { validateProject, fillDeployConfig } from './deploy/config.js';
-import { ui } from '@shopify/cli-kit';
 import { sleep } from '@shopify/cli-kit/node/system';
 import { isUnitTest } from '@shopify/cli-kit/node/environment/local';
+import { renderTasks, renderWarning } from '@shopify/cli-kit/node/ui';
 const backoffPolicy = [5, 10, 15, 30, 60];
 export async function deployToOxygen(_config) {
     await validateProject(_config);
     /* eslint-disable require-atomic-updates */
     const tasks = [
         {
-            title: '📝 Getting deployment config',
-            task: async (ctx, task) => {
+            title: 'Getting deployment config',
+            task: async (ctx) => {
                 ctx.config = await fillDeployConfig(_config);
-                task.title = '📝 Deployment config parsed';
             },
         },
         {
-            title: '💡 Initializing deployment',
+            title: 'Initializing deployment',
             task: async (ctx, task) => {
                 await shouldRetryOxygenCall(task, 'Could not create deployment on Oxygen.');
                 const { deploymentID, assetBaseURL } = await createDeployment(ctx.config);
                 ctx.assetBaseURL = assetBaseURL;
                 ctx.deploymentID = deploymentID;
-                task.title = '✨ Deployment initialized';
             },
             retry: backoffPolicy.length,
         },
         {
-            title: '🛠 Building project',
-            task: async (ctx, task) => {
+            title: 'Building project',
+            task: async (ctx) => {
                 const subTasks = buildTaskList({
                     directory: ctx.config.path,
                     targets: {
@@ -39,60 +37,57 @@ export async function deployToOxygen(_config) {
                     },
                     assetBaseURL: ctx.assetBaseURL,
                 });
-                return task.newListr(subTasks);
+                return subTasks;
             },
-            skip: (ctx) => ctx.config.pathToBuild,
+            skip: (ctx) => Boolean(ctx.config.pathToBuild),
         },
         {
-            title: '🚀 Uploading deployment files',
+            title: 'Uploading deployment files',
             task: async (ctx, task) => {
                 await shouldRetryOxygenCall(task, 'Uploading files to Oxygen failed.');
                 ctx.previewURL = await uploadDeployment(ctx.config, ctx.deploymentID);
-                task.output = `Preview URL: ${ctx.previewURL}`;
-                task.title = '🚀 Files uploaded';
-            },
-            options: {
-                bottomBar: Infinity,
-                persistentOutput: true,
             },
             retry: backoffPolicy.length,
         },
         {
-            title: '📡 Checking deployment health',
+            title: 'Checking deployment health',
             task: async (ctx, task) => {
-                const retryCount = task.isRetrying()?.count;
+                const retryCount = task.retryCount;
                 if (retryCount === backoffPolicy.length) {
-                    task.title =
-                        "The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.";
-                    return;
+                    throw new Error(`Deployment health check failed.`);
                 }
                 if (retryCount && !isUnitTest())
                     await sleep(backoffPolicy[retryCount - 1]);
                 await healthCheck(ctx.previewURL);
-                task.title = '✅ Deployed successfully';
             },
             retry: backoffPolicy.length,
             skip: (ctx) => !ctx.config.healthCheck,
         },
     ];
     /* eslint-enable require-atomic-updates */
-    const list = ui.newListr(tasks, {
-        concurrent: false,
-        rendererOptions: { collapse: false },
-        rendererSilent: isUnitTest(),
-    });
-    return list.run();
+    try {
+        await renderTasks(tasks);
+    }
+    catch (error) {
+        if (error instanceof Error && error.message === 'Deployment health check failed.') {
+            renderWarning({
+                headline: "The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.",
+            });
+        }
+        else {
+            throw error;
+        }
+    }
 }
-async function shouldRetryOxygenCall(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-task, errorMessage) {
-    const retryCount = task.isRetrying()?.count;
+async function shouldRetryOxygenCall(task, errorMessage) {
+    const retryCount = task.retryCount;
+    const taskErrors = task.errors ?? [];
     if (retryCount === backoffPolicy.length) {
-        throw new Error(`${errorMessage} ${task.errors[task.errors.length - 1]?.message}`);
+        throw new Error(`${errorMessage} ${taskErrors[taskErrors.length - 1]?.message}`);
     }
     if (retryCount) {
-        if (task.errors.length > 0) {
-            const unrecoverableError = task.errors.find((error) => error.message.includes('Unrecoverable'));
+        if (taskErrors.length > 0) {
+            const unrecoverableError = taskErrors.find((error) => error.message.includes('Unrecoverable'));
             if (unrecoverableError) {
                 throw new Error(unrecoverableError.message);
             }

package/dist/cli/services/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/cli/services/deploy.ts"],"names":[],"mappings":"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","sourcesContent":["import {DeployConfig, ReqDeployConfig} from './deploy/types.js'\nimport {createDeployment, healthCheck, uploadDeployment} from './deploy/upload.js'\nimport {buildTaskList} from './build.js'\nimport {validateProject, fillDeployConfig} from './deploy/config.js'\nimport {ui} from '@shopify/cli-kit'\nimport {sleep} from '@shopify/cli-kit/node/system'\nimport {isUnitTest} from '@shopify/cli-kit/node/environment/local'\n\ninterface TaskContext {\n  config: ReqDeployConfig\n  deploymentID: string\n  assetBaseURL: string\n  previewURL: string\n}\n\nconst backoffPolicy = [5, 10, 15, 30, 60]\n\nexport async function deployToOxygen(_config: DeployConfig) {\n  await validateProject(_config)\n\n  /* eslint-disable require-atomic-updates */\n  const tasks: ui.ListrTask<TaskContext>[] = [\n    {\n      title: '📝 Getting deployment config',\n      task: async (ctx, task) => {\n        ctx.config = await fillDeployConfig(_config)\n        task.title = '📝 Deployment config parsed'\n      },\n    },\n    {\n      title: '💡 Initializing deployment',\n      task: async (ctx, task) => {\n        await shouldRetryOxygenCall(task, 'Could not create deployment on Oxygen.')\n\n        const {deploymentID, assetBaseURL} = await createDeployment(ctx.config)\n        ctx.assetBaseURL = assetBaseURL\n        ctx.deploymentID = deploymentID\n        task.title = '✨ Deployment initialized'\n      },\n      retry: backoffPolicy.length,\n    },\n    {\n      title: '🛠 Building project',\n      task: async (ctx, task) => {\n        const subTasks = buildTaskList({\n          directory: ctx.config.path,\n          targets: {\n            client: true,\n            worker: '@shopify/hydrogen/platforms/worker',\n            node: false,\n          },\n          assetBaseURL: ctx.assetBaseURL,\n        })\n\n        return task.newListr(subTasks)\n      },\n      skip: (ctx) => ctx.config.pathToBuild,\n    },\n    {\n      title: '🚀 Uploading deployment files',\n      task: async (ctx, task) => {\n        await shouldRetryOxygenCall(task, 'Uploading files to Oxygen failed.')\n\n        ctx.previewURL = await uploadDeployment(ctx.config, ctx.deploymentID)\n        task.output = `Preview URL: ${ctx.previewURL}`\n        task.title = '🚀 Files uploaded'\n      },\n      options: {\n        bottomBar: Infinity,\n        persistentOutput: true,\n      },\n      retry: backoffPolicy.length,\n    },\n    {\n      title: '📡 Checking deployment health',\n      task: async (ctx, task) => {\n        const retryCount = task.isRetrying()?.count\n\n        if (retryCount === backoffPolicy.length) {\n          task.title =\n            \"The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.\"\n          return\n        }\n        if (retryCount && !isUnitTest()) await sleep(backoffPolicy[retryCount - 1]!)\n\n        await healthCheck(ctx.previewURL)\n        task.title = '✅ Deployed successfully'\n      },\n      retry: backoffPolicy.length,\n      skip: (ctx) => !ctx.config.healthCheck,\n    },\n  ]\n  /* eslint-enable require-atomic-updates */\n\n  const list = ui.newListr(tasks, {\n    concurrent: false,\n    rendererOptions: {collapse: false},\n    rendererSilent: isUnitTest(),\n  })\n\n  return list.run()\n}\n\nasync function shouldRetryOxygenCall(\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  task: ui.ListrTaskWrapper<TaskContext, any>,\n  errorMessage: string,\n) {\n  const retryCount = task.isRetrying()?.count\n  if (retryCount === backoffPolicy.length) {\n    throw new Error(`${errorMessage} ${task.errors[task.errors.length - 1]?.message}`)\n  }\n  if (retryCount) {\n    if (task.errors.length > 0) {\n      const unrecoverableError = task.errors.find((error) => error.message.includes('Unrecoverable'))\n      if (unrecoverableError) {\n        throw new Error(unrecoverableError.message)\n      }\n    }\n  }\n  if (retryCount && !isUnitTest()) await sleep(backoffPolicy[retryCount - 1]!)\n}\n"]}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/cli/services/deploy.ts"],"names":[],"mappings":"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","sourcesContent":["import {DeployConfig, ReqDeployConfig} from './deploy/types.js'\nimport {createDeployment, healthCheck, uploadDeployment} from './deploy/upload.js'\nimport {buildTaskList} from './build.js'\nimport {validateProject, fillDeployConfig} from './deploy/config.js'\nimport {sleep} from '@shopify/cli-kit/node/system'\nimport {isUnitTest} from '@shopify/cli-kit/node/environment/local'\nimport {Task, renderTasks, renderWarning} from '@shopify/cli-kit/node/ui'\n\ninterface TaskContext {\n  config: ReqDeployConfig\n  deploymentID: string\n  assetBaseURL: string\n  previewURL: string\n}\n\nconst backoffPolicy = [5, 10, 15, 30, 60]\n\nexport async function deployToOxygen(_config: DeployConfig) {\n  await validateProject(_config)\n\n  /* eslint-disable require-atomic-updates */\n  const tasks: Task<TaskContext>[] = [\n    {\n      title: 'Getting deployment config',\n      task: async (ctx) => {\n        ctx.config = await fillDeployConfig(_config)\n      },\n    },\n    {\n      title: 'Initializing deployment',\n      task: async (ctx, task) => {\n        await shouldRetryOxygenCall(task, 'Could not create deployment on Oxygen.')\n\n        const {deploymentID, assetBaseURL} = await createDeployment(ctx.config)\n        ctx.assetBaseURL = assetBaseURL\n        ctx.deploymentID = deploymentID\n      },\n      retry: backoffPolicy.length,\n    },\n    {\n      title: 'Building project',\n      task: async (ctx) => {\n        const subTasks = buildTaskList({\n          directory: ctx.config.path,\n          targets: {\n            client: true,\n            worker: '@shopify/hydrogen/platforms/worker',\n            node: false,\n          },\n          assetBaseURL: ctx.assetBaseURL,\n        })\n\n        return subTasks\n      },\n      skip: (ctx) => Boolean(ctx.config.pathToBuild),\n    },\n    {\n      title: 'Uploading deployment files',\n      task: async (ctx, task) => {\n        await shouldRetryOxygenCall(task, 'Uploading files to Oxygen failed.')\n\n        ctx.previewURL = await uploadDeployment(ctx.config, ctx.deploymentID)\n      },\n      retry: backoffPolicy.length,\n    },\n    {\n      title: 'Checking deployment health',\n      task: async (ctx, task) => {\n        const retryCount = task.retryCount\n\n        if (retryCount === backoffPolicy.length) {\n          throw new Error(`Deployment health check failed.`)\n        }\n\n        if (retryCount && !isUnitTest()) await sleep(backoffPolicy[retryCount - 1]!)\n\n        await healthCheck(ctx.previewURL)\n      },\n      retry: backoffPolicy.length,\n      skip: (ctx) => !ctx.config.healthCheck,\n    },\n  ]\n  /* eslint-enable require-atomic-updates */\n\n  try {\n    await renderTasks(tasks)\n  } catch (error: unknown) {\n    if (error instanceof Error && error.message === 'Deployment health check failed.') {\n      renderWarning({\n        headline:\n          \"The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.\",\n      })\n    } else {\n      throw error\n    }\n  }\n}\n\nasync function shouldRetryOxygenCall(task: Task<TaskContext>, errorMessage: string) {\n  const retryCount = task.retryCount\n  const taskErrors = task.errors ?? []\n  if (retryCount === backoffPolicy.length) {\n    throw new Error(`${errorMessage} ${taskErrors[taskErrors.length - 1]?.message}`)\n  }\n  if (retryCount) {\n    if (taskErrors.length > 0) {\n      const unrecoverableError = taskErrors.find((error) => error.message.includes('Unrecoverable'))\n      if (unrecoverableError) {\n        throw new Error(unrecoverableError.message)\n      }\n    }\n  }\n  if (retryCount && !isUnitTest()) await sleep(backoffPolicy[retryCount - 1]!)\n}\n"]}

package/dist/cli/services/eslint.js

@@ -1,42 +1,28 @@
 import { genericConfigurationFileNames } from '../constants.js';
-import { ui } from '@shopify/cli-kit';
 import { addNPMDependenciesWithoutVersionIfNeeded, findUpAndReadPackageJson, writePackageJSON, } from '@shopify/cli-kit/node/node-package-manager';
 import { addRecommendedExtensions, isVSCode } from '@shopify/cli-kit/node/vscode';
-import { isUnitTest } from '@shopify/cli-kit/node/environment/local';
 import { writeFile, fileExists, removeFile, fileContentPrettyFormat } from '@shopify/cli-kit/node/fs';
 import { joinPath } from '@shopify/cli-kit/node/path';
 import { AbortError } from '@shopify/cli-kit/node/error';
-import stream from 'stream';
+import { renderTasks } from '@shopify/cli-kit/node/ui';
 export async function addESLint({ app, force, install }) {
-    const list = ui.newListr([
+    const vscode = await isVSCode(app.directory);
+    const tasks = [
         {
-            title: 'Installing additional dependencies',
+            title: 'Installing dependencies',
             skip: () => !install,
-            task: async (_, task) => {
+            task: async () => {
                 const requiredDependencies = ['eslint', 'eslint-plugin-hydrogen', 'prettier', '@shopify/prettier-config'];
                 await addNPMDependenciesWithoutVersionIfNeeded(requiredDependencies, {
                     packageManager: app.packageManager,
                     type: 'prod',
                     directory: app.directory,
-                    stderr: new stream.Writable({
-                        write(chunk, encoding, next) {
-                            task.output = chunk.toString();
-                            next();
-                        },
-                    }),
-                    stdout: new stream.Writable({
-                        write(chunk, encoding, next) {
-                            task.output = chunk.toString();
-                            next();
-                        },
-                    }),
                 });
-                task.title = 'Dependencies installed';
             },
         },
         {
             title: 'Adding ESLint configuration',
-            task: async (_, task) => {
+            task: async () => {
                 const eslintConfigPath = joinPath(app.directory, genericConfigurationFileNames.eslint);
                 if (await fileExists(eslintConfigPath)) {
                     if (force) {
@@ -52,29 +38,26 @@ export async function addESLint({ app, force, install }) {
                 }
                 const eslintConfig = await fileContentPrettyFormat(['module.exports = {', 'extends: [', `${extended.join(',')}`, ' ],', ' };'].join('\n'), { path: genericConfigurationFileNames.eslint });
                 await writeFile(eslintConfigPath, eslintConfig);
-                task.title = 'ESLint configuration added';
             },
         },
         {
             title: 'Updating package.json',
-            task: async (_, task) => {
+            task: async () => {
                 const packageJSON = (await findUpAndReadPackageJson(app.directory)).content;
                 packageJSON.scripts = packageJSON.scripts || {};
                 packageJSON.scripts.lint = `eslint --ext .js,.ts,.jsx,.tsx src/`;
                 packageJSON.prettier = '@shopify/prettier-config';
                 await writePackageJSON(app.directory, packageJSON);
-                task.title = 'Package.json updated';
             },
         },
         {
             title: 'Adding editor plugin recommendations',
-            skip: async () => !(await isVSCode(app.directory)),
-            task: async (_, task) => {
+            skip: () => !vscode,
+            task: async () => {
                 await addRecommendedExtensions(app.directory, ['dbaeumer.vscode-eslint']);
-                task.title = 'Editor plugin recommendations added';
             },
         },
-    ], { rendererSilent: isUnitTest() });
-    await list.run();
+    ];
+    await renderTasks(tasks);
 }
 //# sourceMappingURL=eslint.js.map

package/dist/cli/services/eslint.js.map

@@ -1 +1 @@
-{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/services/eslint.ts"],"names":[],"mappings":"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","sourcesContent":["import {HydrogenApp} from '../models/hydrogen.js'\nimport {genericConfigurationFileNames} from '../constants.js'\nimport {ui} from '@shopify/cli-kit'\nimport {\n  addNPMDependenciesWithoutVersionIfNeeded,\n  findUpAndReadPackageJson,\n  writePackageJSON,\n} from '@shopify/cli-kit/node/node-package-manager'\nimport {addRecommendedExtensions, isVSCode} from '@shopify/cli-kit/node/vscode'\nimport {isUnitTest} from '@shopify/cli-kit/node/environment/local'\nimport {writeFile, fileExists, removeFile, fileContentPrettyFormat} from '@shopify/cli-kit/node/fs'\nimport {joinPath} from '@shopify/cli-kit/node/path'\nimport {AbortError} from '@shopify/cli-kit/node/error'\nimport stream from 'stream'\n\ninterface AddESlintOptions {\n  app: HydrogenApp\n  force: boolean\n  install: boolean\n}\n\nexport async function addESLint({app, force, install}: AddESlintOptions) {\n  const list = ui.newListr(\n    [\n      {\n        title: 'Installing additional dependencies',\n        skip: () => !install,\n        task: async (_, task) => {\n          const requiredDependencies = ['eslint', 'eslint-plugin-hydrogen', 'prettier', '@shopify/prettier-config']\n          await addNPMDependenciesWithoutVersionIfNeeded(requiredDependencies, {\n            packageManager: app.packageManager,\n            type: 'prod',\n            directory: app.directory,\n            stderr: new stream.Writable({\n              write(chunk, encoding, next) {\n                task.output = chunk.toString()\n                next()\n              },\n            }),\n            stdout: new stream.Writable({\n              write(chunk, encoding, next) {\n                task.output = chunk.toString()\n                next()\n              },\n            }),\n          })\n          task.title = 'Dependencies installed'\n        },\n      },\n\n      {\n        title: 'Adding ESLint configuration',\n        task: async (_, task) => {\n          const eslintConfigPath = joinPath(app.directory, genericConfigurationFileNames.eslint)\n\n          if (await fileExists(eslintConfigPath)) {\n            if (force) {\n              await removeFile(eslintConfigPath)\n            } else {\n              throw new AbortError('ESLint config already exists.', 'Use --force to override existing config.')\n            }\n          }\n\n          const extended = [`'plugin:hydrogen/recommended'`]\n\n          if (app.language === 'TypeScript') {\n            extended.push(`'plugin:hydrogen/typescript'`)\n          }\n\n          const eslintConfig = await fileContentPrettyFormat(\n            ['module.exports = {', 'extends: [', `${extended.join(',')}`, ' ],', ' };'].join('\\n'),\n            {path: genericConfigurationFileNames.eslint},\n          )\n\n          await writeFile(eslintConfigPath, eslintConfig)\n\n          task.title = 'ESLint configuration added'\n        },\n      },\n      {\n        title: 'Updating package.json',\n        task: async (_, task) => {\n          const packageJSON = (await findUpAndReadPackageJson(app.directory)).content\n          packageJSON.scripts = packageJSON.scripts || {}\n          packageJSON.scripts.lint = `eslint --ext .js,.ts,.jsx,.tsx src/`\n\n          packageJSON.prettier = '@shopify/prettier-config'\n\n          await writePackageJSON(app.directory, packageJSON)\n\n          task.title = 'Package.json updated'\n        },\n      },\n      {\n        title: 'Adding editor plugin recommendations',\n        skip: async () => !(await isVSCode(app.directory)),\n        task: async (_, task) => {\n          await addRecommendedExtensions(app.directory, ['dbaeumer.vscode-eslint'])\n          task.title = 'Editor plugin recommendations added'\n        },\n      },\n    ],\n    {rendererSilent: isUnitTest()},\n  )\n  await list.run()\n}\n"]}
+{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/services/eslint.ts"],"names":[],"mappings":"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","sourcesContent":["import {HydrogenApp} from '../models/hydrogen.js'\nimport {genericConfigurationFileNames} from '../constants.js'\nimport {\n  addNPMDependenciesWithoutVersionIfNeeded,\n  findUpAndReadPackageJson,\n  writePackageJSON,\n} from '@shopify/cli-kit/node/node-package-manager'\nimport {addRecommendedExtensions, isVSCode} from '@shopify/cli-kit/node/vscode'\nimport {writeFile, fileExists, removeFile, fileContentPrettyFormat} from '@shopify/cli-kit/node/fs'\nimport {joinPath} from '@shopify/cli-kit/node/path'\nimport {AbortError} from '@shopify/cli-kit/node/error'\nimport {renderTasks, Task} from '@shopify/cli-kit/node/ui'\n\ninterface AddESlintOptions {\n  app: HydrogenApp\n  force: boolean\n  install: boolean\n}\n\nexport async function addESLint({app, force, install}: AddESlintOptions) {\n  const vscode = await isVSCode(app.directory)\n\n  const tasks: Task[] = [\n    {\n      title: 'Installing dependencies',\n      skip: () => !install,\n      task: async () => {\n        const requiredDependencies = ['eslint', 'eslint-plugin-hydrogen', 'prettier', '@shopify/prettier-config']\n        await addNPMDependenciesWithoutVersionIfNeeded(requiredDependencies, {\n          packageManager: app.packageManager,\n          type: 'prod',\n          directory: app.directory,\n        })\n      },\n    },\n\n    {\n      title: 'Adding ESLint configuration',\n      task: async () => {\n        const eslintConfigPath = joinPath(app.directory, genericConfigurationFileNames.eslint)\n\n        if (await fileExists(eslintConfigPath)) {\n          if (force) {\n            await removeFile(eslintConfigPath)\n          } else {\n            throw new AbortError('ESLint config already exists.', 'Use --force to override existing config.')\n          }\n        }\n\n        const extended = [`'plugin:hydrogen/recommended'`]\n\n        if (app.language === 'TypeScript') {\n          extended.push(`'plugin:hydrogen/typescript'`)\n        }\n\n        const eslintConfig = await fileContentPrettyFormat(\n          ['module.exports = {', 'extends: [', `${extended.join(',')}`, ' ],', ' };'].join('\\n'),\n          {path: genericConfigurationFileNames.eslint},\n        )\n\n        await writeFile(eslintConfigPath, eslintConfig)\n      },\n    },\n    {\n      title: 'Updating package.json',\n      task: async () => {\n        const packageJSON = (await findUpAndReadPackageJson(app.directory)).content\n        packageJSON.scripts = packageJSON.scripts || {}\n        packageJSON.scripts.lint = `eslint --ext .js,.ts,.jsx,.tsx src/`\n\n        packageJSON.prettier = '@shopify/prettier-config'\n\n        await writePackageJSON(app.directory, packageJSON)\n      },\n    },\n    {\n      title: 'Adding editor plugin recommendations',\n      skip: () => !vscode,\n      task: async () => {\n        await addRecommendedExtensions(app.directory, ['dbaeumer.vscode-eslint'])\n      },\n    },\n  ]\n  await renderTasks(tasks)\n}\n"]}

package/dist/cli/services/info.d.ts

@@ -1,7 +1,7 @@
 import { HydrogenApp } from '../models/hydrogen.js';
-import { output } from '@shopify/cli-kit';
+import { OutputMessage } from '@shopify/cli-kit/node/output';
 interface InfoOptions {
     showPrivateData: boolean;
 }
-export declare function info(app: HydrogenApp, { showPrivateData }: InfoOptions): output.Message;
+export declare function info(app: HydrogenApp, { showPrivateData }: InfoOptions): OutputMessage;
 export {};

package/dist/cli/services/info.js

@@ -1,12 +1,12 @@
-import { output } from '@shopify/cli-kit';
 import { platformAndArch } from '@shopify/cli-kit/node/os';
 import { capitalize, linesToColumns } from '@shopify/cli-kit/common/string';
+import { outputContent, outputToken } from '@shopify/cli-kit/node/output';
 export function info(app, { showPrivateData }) {
     const appInfo = new HydrogenAppInfo(app);
     return appInfo.output({ showPrivateData });
 }
-const NOT_FOUND_TEXT = output.content `${output.token.italic('Not found')}`.value;
-const NOT_CONFIGURED_TEXT = output.content `${output.token.italic('Not yet configured')}`.value;
+const NOT_FOUND_TEXT = outputContent `${outputToken.italic('Not found')}`.value;
+const NOT_CONFIGURED_TEXT = outputContent `${outputToken.italic('Not yet configured')}`.value;
 class AppInfo {
     constructor(app) {
         this.app = app;
@@ -91,7 +91,7 @@ class AppInfo {
     formattedError(str) {
         const [errorFirstLine, ...errorRemainingLines] = str.split('\n');
         const errorLines = [`! ${errorFirstLine}`, ...errorRemainingLines.map((line) => `  ${line}`)];
-        return output.content `${output.token.errorText(errorLines.join('\n'))}`.value;
+        return outputContent `${outputToken.errorText(errorLines.join('\n'))}`.value;
     }
     systemInfoSection() {
         const title = 'Tooling and System';
@@ -107,7 +107,7 @@ class AppInfo {
     }
     section(title, body) {
         const formattedTitle = `${title.toUpperCase()}${' '.repeat(35 - title.length)}`;
-        return output.content `${output.token.heading(formattedTitle)}\n${body}`.value;
+        return outputContent `${outputToken.heading(formattedTitle)}\n${body}`.value;
     }
 }
 class HydrogenAppInfo extends AppInfo {