@shopify/oxygen-cli 1.12.1-unstable.202309120942.0 → 1.12.1

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.12.1-unstable.202309120942.0",
+  "version": "1.12.1",
   "commands": {
     "oxygen:deploy": {
       "id": "oxygen:deploy",

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "1.12.1-unstable.202309120942.0",
+  "version": "1.12.1",
   "type": "module",
   "scripts": {
     "build": "tsup --clean --config ./tsup.config.ts && oclif manifest",
@@ -15,9 +15,8 @@
     "lint": "eslint --ext .js,.ts --max-warnings 0 src",
     "lint:format": "prettier --write \"**/*.*\" && npm run lint --fix",
     "generate:manifest": "oclif manifest",
-    "prepack": "npm install && npm run build",
-    "prepublishOnly": "rm -rf dist/**/*.test.*",
-    "release": "npm run build && npx changeset publish && git push --follow-tags",
+    "prepublishOnly": "npm install && npm run build && rm -rf dist/**/*.test.*",
+    "release": "npm run prepublishOnly && npx changeset publish && git push --follow-tags",
     "test": "vitest run",
     "test:watch": "vitest"
   },
@@ -25,7 +24,7 @@
     "oxygen-cli": "./dist/oxygen-cli.js"
   },
   "engines": {
-    "node": ">=14.17.0"
+    "node": ">=16.14.0"
   },
   "exports": {
     "./deploy": "./dist/deploy/index.js"
@@ -36,7 +35,7 @@
   ],
   "dependencies": {
     "@oclif/core": "2.15.0",
-    "@shopify/cli-kit": "nightly",
+    "@shopify/cli-kit": "^3.49.3",
     "async": "^3.2.4"
   },
   "devDependencies": {
@@ -44,7 +43,7 @@
     "@shopify/eslint-plugin": "^43.0.0",
     "@shopify/prettier-config": "^1.1.2",
     "@types/async": "^3.2.18",
-    "@types/node": "^20.5.9",
+    "@types/node": "^20.6.3",
     "eslint": "^8.49.0",
     "eslint-plugin-prettier": "^5.0.0",
     "node-fetch": "^3.3.2",
@@ -52,7 +51,7 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.9",
-    "vitest": "^0.34.4"
+    "vitest": "^0.34.5"
   },
   "prettier": "@shopify/prettier-config",
   "oclif": {

package/dist/deploy/build-cancel.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/deploy/build-cancel.test.js

@@ -1,90 +0,0 @@
-import { AbortError } from '@shopify/cli-kit/node/error';
-import { graphqlRequest } from '@shopify/cli-kit/node/api/graphql';
-import { vi, describe, test, expect } from 'vitest';
-import { createTestConfig } from '../utils/test-helper.js';
-import { stderrLogger, Header } from '../utils/utils.js';
-import { buildCancel } from './build-cancel.js';
-
-vi.mock("@shopify/cli-kit/node/api/graphql");
-vi.mock("@shopify/cli-kit/node/output", () => {
-  return {
-    outputInfo: vi.fn()
-  };
-});
-const testConfig = createTestConfig("/tmp/deploymentRoot/");
-describe("BuildCancel", () => {
-  test("should cancel a build", async () => {
-    const response = {
-      buildCancel: {
-        userErrors: []
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    const cancelResponse = await buildCancel({
-      config: testConfig,
-      buildId: "build-1",
-      reason: "because",
-      logger: stderrLogger
-    });
-    expect(cancelResponse).toEqual(response.buildCancel);
-    expect(graphqlRequest).toHaveBeenCalledWith({
-      query: expect.any(String),
-      api: "Oxygen",
-      url: `${testConfig.deploymentUrl}/api/v2/admin/graphql`,
-      token: testConfig.deploymentToken.accessToken,
-      variables: {
-        buildId: "build-1",
-        reason: "because"
-      },
-      addedHeaders: {
-        [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
-      }
-    });
-  });
-  test("should throw AbortError when buildCancel fails with error", async () => {
-    const response = {
-      buildCancel: {
-        userErrors: [
-          {
-            message: "Cannot cancel build."
-          }
-        ]
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    await expect(
-      buildCancel({
-        config: testConfig,
-        buildId: "build-1",
-        reason: "because",
-        logger: stderrLogger
-      })
-    ).rejects.toThrow(
-      new AbortError(
-        `Failed to cancel build: ${response.buildCancel.userErrors[0]?.message}`
-      )
-    );
-  });
-  test("should throw AbortError when unauthorized", async () => {
-    const error = {
-      statusCode: 401
-    };
-    vi.mocked(graphqlRequest).mockRejectedValueOnce(error);
-    try {
-      await expect(
-        buildCancel({
-          config: testConfig,
-          buildId: "build-1",
-          reason: "because",
-          logger: stderrLogger
-        })
-      ).rejects.toThrow(
-        new AbortError(
-          "You are not authorized to perform this action. Please check your deployment token."
-        )
-      );
-    } catch (err) {
-      expect(error).toBeInstanceOf(AbortError);
-    }
-  });
-});

package/dist/deploy/build-initiate.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/deploy/build-initiate.test.js

@@ -1,93 +0,0 @@
-import { AbortError } from '@shopify/cli-kit/node/error';
-import { graphqlRequest } from '@shopify/cli-kit/node/api/graphql';
-import { outputCompleted } from '@shopify/cli-kit/node/output';
-import { vi, describe, test, expect } from 'vitest';
-import { stderrLogger, Header } from '../utils/utils.js';
-import { createTestConfig } from '../utils/test-helper.js';
-import { buildInitiate } from './build-initiate.js';
-
-vi.mock("@shopify/cli-kit/node/api/graphql");
-vi.mock("@shopify/cli-kit/node/output");
-const testConfig = createTestConfig("/tmp/deploymentRoot/");
-describe("BuildInitiate", () => {
-  test("should initiate a build", async () => {
-    const response = {
-      buildInitiate: {
-        build: {
-          id: "build-1"
-        },
-        userErrors: []
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    const initiateResponse = await buildInitiate({
-      config: testConfig,
-      environment: {
-        tag: testConfig.environmentTag
-      },
-      labels: [],
-      logger: stderrLogger
-    });
-    expect(initiateResponse).toEqual(response.buildInitiate);
-    expect(graphqlRequest).toHaveBeenCalledWith({
-      query: expect.any(String),
-      api: "Oxygen",
-      url: `${testConfig.deploymentUrl}/api/v2/admin/graphql`,
-      token: testConfig.deploymentToken.accessToken,
-      variables: { environment: { tag: testConfig.environmentTag }, labels: [] },
-      addedHeaders: {
-        [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
-      }
-    });
-    expect(outputCompleted).toHaveBeenCalledWith(
-      "Build initiated successfully with id build-1.",
-      stderrLogger
-    );
-  });
-  test("should throw AbortError when build initiation fails due to user errors", async () => {
-    const response = {
-      buildInitiate: {
-        userErrors: [
-          {
-            message: "Error: cannot proceed with build."
-          }
-        ]
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    await expect(
-      buildInitiate({
-        config: testConfig,
-        environment: { tag: "preview" },
-        labels: [],
-        logger: stderrLogger
-      })
-    ).rejects.toThrow(
-      new AbortError(
-        `Failed to create build. ${response.buildInitiate.userErrors[0]?.message}`
-      )
-    );
-  });
-  test("should throw AbortError when unauthorized", async () => {
-    const error = {
-      statusCode: 401
-    };
-    vi.mocked(graphqlRequest).mockRejectedValueOnce(error);
-    try {
-      await expect(
-        buildInitiate({
-          config: testConfig,
-          environment: { tag: "preview" },
-          labels: [],
-          logger: stderrLogger
-        })
-      ).rejects.toThrow(
-        new AbortError(
-          "You are not authorized to perform this action. Please check your deployment token."
-        )
-      );
-    } catch (err) {
-      expect(error).toBeInstanceOf(AbortError);
-    }
-  });
-});

package/dist/deploy/build-project.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/deploy/build-project.test.js

@@ -1,68 +0,0 @@
-import { spawn } from 'child_process';
-import { vi, test, expect } from 'vitest';
-import { createTestConfig } from '../utils/test-helper.js';
-import { buildProject } from './build-project.js';
-
-let returnCode = 0;
-vi.mock("child_process", () => {
-  const spawn2 = vi.fn();
-  spawn2.mockImplementation(() => {
-    return {
-      stdout: {
-        on: () => {
-        },
-        pipe: () => {
-        }
-      },
-      on: (event, callback) => {
-        if (event === "close") {
-          return callback(returnCode);
-        }
-      }
-    };
-  });
-  return { spawn: spawn2 };
-});
-const testConfig = createTestConfig("rootFolder");
-test("BuildProject builds the project successfully", async () => {
-  const config = {
-    ...testConfig,
-    buildCommand: "npm run build"
-  };
-  const assetPath = "https://example.com/assets";
-  await buildProject({ config, assetPath });
-  expect(spawn).toBeCalledWith("npm run build", [], {
-    cwd: "rootFolder",
-    shell: true,
-    stdio: ["inherit", process.stderr, "inherit"],
-    env: {
-      // eslint-disable-next-line no-process-env
-      ...process.env,
-      HYDROGEN_ASSET_BASE_URL: "https://example.com/assets"
-    }
-  });
-});
-test("should throw error on build command failure", async () => {
-  returnCode = 1;
-  const assetPath = "https://example.com/assets";
-  await expect(
-    () => buildProject({ config: testConfig, assetPath })
-  ).rejects.toThrow("Build failed with error code: 1");
-});
-test("should call buildFunction hook if provided", async () => {
-  const buildFunction = vi.fn().mockResolvedValue(void 0);
-  const hooks = { buildFunction };
-  const assetPath = "https://example.com/assets";
-  await buildProject({ config: testConfig, assetPath, hooks });
-  expect(buildFunction).toBeCalledWith(assetPath);
-});
-test("should throw error if buildFunction hook fails", async () => {
-  const buildFunction = vi.fn().mockRejectedValue(new Error("Oops! I tripped over a cable."));
-  const hooks = { buildFunction };
-  const assetPath = "https://example.com/assets";
-  await expect(
-    () => buildProject({ config: testConfig, assetPath, hooks })
-  ).rejects.toThrow(
-    "Build function failed with error: Error: Oops! I tripped over a cable."
-  );
-});

package/dist/deploy/deployment-cancel.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/deploy/deployment-cancel.test.js

@@ -1,89 +0,0 @@
-import { AbortError } from '@shopify/cli-kit/node/error';
-import { graphqlRequest } from '@shopify/cli-kit/node/api/graphql';
-import { vi, describe, test, expect } from 'vitest';
-import { createTestConfig } from '../utils/test-helper.js';
-import { stderrLogger, Header } from '../utils/utils.js';
-import { deploymentCancel } from './deployment-cancel.js';
-
-vi.mock("@shopify/cli-kit/node/api/graphql");
-vi.mock("@shopify/cli-kit/node/output");
-const testConfig = createTestConfig("/tmp/deploymentRoot");
-describe("DeploymentComplete", () => {
-  test("should cancel a deployment", async () => {
-    const response = {
-      deploymentCancel: {
-        deployment: {
-          id: "deployment-1"
-        },
-        userErrors: []
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    const completeResponse = await deploymentCancel({
-      config: testConfig,
-      deploymentId: "deployment-1",
-      reason: "error message",
-      logger: stderrLogger
-    });
-    expect(completeResponse).toEqual(response.deploymentCancel);
-    expect(graphqlRequest).toHaveBeenCalledWith({
-      query: expect.any(String),
-      api: "Oxygen",
-      url: `${testConfig.deploymentUrl}/api/v2/admin/graphql`,
-      token: testConfig.deploymentToken.accessToken,
-      variables: {
-        deploymentId: "deployment-1",
-        reason: "error message"
-      },
-      addedHeaders: {
-        [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
-      }
-    });
-  });
-  test("should throw AbortError when deploymentComplete fails with error", async () => {
-    const response = {
-      deploymentCancel: {
-        userErrors: [
-          {
-            message: "Cannot cancel deployment."
-          }
-        ]
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    await expect(
-      deploymentCancel({
-        config: testConfig,
-        deploymentId: "deployment-1",
-        reason: "error message",
-        logger: stderrLogger
-      })
-    ).rejects.toThrow(
-      new AbortError(
-        `Failed to cancel deployment: ${response.deploymentCancel.userErrors[0]?.message}`
-      )
-    );
-  });
-  test("should throw AbortError when unauthorized", async () => {
-    const error = {
-      statusCode: 401
-    };
-    vi.mocked(graphqlRequest).mockRejectedValueOnce(error);
-    try {
-      await expect(
-        deploymentCancel({
-          config: testConfig,
-          deploymentId: "deployment-1",
-          reason: "error message",
-          logger: stderrLogger
-        })
-      ).rejects.toThrow(
-        new AbortError(
-          "You are not authorized to perform this action. Please check your deployment token."
-        )
-      );
-    } catch (err) {
-      expect(error).toBeInstanceOf(AbortError);
-    }
-  });
-});

package/dist/deploy/deployment-complete.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/deploy/deployment-complete.test.js

@@ -1,77 +0,0 @@
-import { AbortError } from '@shopify/cli-kit/node/error';
-import { graphqlRequest } from '@shopify/cli-kit/node/api/graphql';
-import { vi, describe, test, expect } from 'vitest';
-import { createTestConfig } from '../utils/test-helper.js';
-import { Header } from '../utils/utils.js';
-import { deploymentComplete } from './deployment-complete.js';
-
-vi.mock("@shopify/cli-kit/node/api/graphql");
-const testConfig = createTestConfig("/tmp/deploymentRoot");
-describe("DeploymentComplete", () => {
-  test("should complete a deployment", async () => {
-    const response = {
-      deploymentComplete: {
-        deployment: {
-          id: "deployment-1",
-          status: "pending",
-          url: "https://www.go-here.com"
-        },
-        userErrors: []
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    const completeResponse = await deploymentComplete(
-      testConfig,
-      "deployment-1"
-    );
-    expect(completeResponse).toEqual(response.deploymentComplete);
-    expect(graphqlRequest).toHaveBeenCalledWith({
-      query: expect.any(String),
-      api: "Oxygen",
-      url: `${testConfig.deploymentUrl}/api/v2/admin/graphql`,
-      token: testConfig.deploymentToken.accessToken,
-      variables: {
-        deploymentId: "deployment-1"
-      },
-      addedHeaders: {
-        [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
-      }
-    });
-  });
-  test("should throw AbortError when deploymentComplete fails with error", async () => {
-    const response = {
-      deploymentComplete: {
-        userErrors: [
-          {
-            message: "Cannot complete deployment."
-          }
-        ]
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    await expect(
-      deploymentComplete(testConfig, "deployment-1")
-    ).rejects.toThrow(
-      new AbortError(
-        `Failed to complete deployment: ${response.deploymentComplete.userErrors[0]?.message}`
-      )
-    );
-  });
-  test("should throw AbortError when unauthorized", async () => {
-    const error = {
-      statusCode: 401
-    };
-    vi.mocked(graphqlRequest).mockRejectedValueOnce(error);
-    try {
-      await expect(
-        deploymentComplete(testConfig, "deployment-1")
-      ).rejects.toThrow(
-        new AbortError(
-          "You are not authorized to perform this action. Please check your deployment token."
-        )
-      );
-    } catch (err) {
-      expect(error).toBeInstanceOf(AbortError);
-    }
-  });
-});

package/dist/deploy/deployment-initiate.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/deploy/deployment-initiate.test.js

@@ -1,156 +0,0 @@
-import { AbortError } from '@shopify/cli-kit/node/error';
-import { graphqlRequest } from '@shopify/cli-kit/node/api/graphql';
-import { outputCompleted } from '@shopify/cli-kit/node/output';
-import { vi, describe, test, expect } from 'vitest';
-import { createTestConfig } from '../utils/test-helper.js';
-import { stderrLogger, Header } from '../utils/utils.js';
-import { deploymentInitiate } from './deployment-initiate.js';
-
-vi.mock("@shopify/cli-kit/node/api/graphql");
-vi.mock("@shopify/cli-kit/node/output");
-const testConfig = createTestConfig("/tmp/deploymentRoot");
-const testManifest = [
-  {
-    filePath: "index.js",
-    fileSize: 20,
-    mimeType: "application/javascript",
-    fileType: "WORKER",
-    fileHash: "b62d550d0cae0c4f15e0e16fc2492893"
-  }
-];
-const testResponse = {
-  deploymentInitiate: {
-    deployment: {
-      id: "gid://oxygen-hub/Deployment/1"
-    },
-    deploymentTargets: [
-      {
-        filePath: "index.js",
-        fileSize: 20,
-        uploadUrl: "https://storage.googleapis.com/dms-assets-test/",
-        fileType: "WORKER",
-        parameters: []
-      }
-    ],
-    userErrors: []
-  }
-};
-describe("DeploymentInitiate", () => {
-  test("should initiate a deployment with a buildId", async () => {
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(testResponse);
-    const initiateResponse = await deploymentInitiate({
-      config: testConfig,
-      input: {
-        buildId: "build-1",
-        manifest: testManifest
-      },
-      logger: stderrLogger
-    });
-    expect(initiateResponse).toEqual(testResponse.deploymentInitiate);
-    expect(graphqlRequest).toHaveBeenCalledWith({
-      query: expect.any(String),
-      api: "Oxygen",
-      url: `${testConfig.deploymentUrl}/api/v2/admin/graphql`,
-      token: testConfig.deploymentToken.accessToken,
-      variables: {
-        buildId: "build-1",
-        environment: void 0,
-        files: testManifest,
-        isPrivate: true
-      },
-      addedHeaders: {
-        [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
-      }
-    });
-    expect(outputCompleted).toHaveBeenCalledWith(
-      `Deployment initiated, ${testManifest.length} files to upload.`,
-      stderrLogger
-    );
-  });
-  test("should initiate a deployment with an environmentName", async () => {
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(testResponse);
-    const initiateResponse = await deploymentInitiate({
-      config: testConfig,
-      input: {
-        buildId: void 0,
-        environment: { tag: "preview" },
-        manifest: testManifest
-      },
-      logger: stderrLogger
-    });
-    expect(initiateResponse).toEqual(testResponse.deploymentInitiate);
-    expect(graphqlRequest).toHaveBeenCalledWith({
-      query: expect.any(String),
-      api: "Oxygen",
-      url: `${testConfig.deploymentUrl}/api/v2/admin/graphql`,
-      token: testConfig.deploymentToken.accessToken,
-      variables: {
-        buildId: void 0,
-        environment: { tag: "preview" },
-        files: testManifest,
-        isPrivate: true
-      },
-      addedHeaders: {
-        [Header.OxygenNamespaceHandle]: `${testConfig.deploymentToken.namespace}`
-      }
-    });
-    expect(outputCompleted).toHaveBeenCalledWith(
-      `Deployment initiated, ${testManifest.length} files to upload.`,
-      stderrLogger
-    );
-  });
-  test("should throw AbortError when deployment initiation fails due to user errors", async () => {
-    const response = {
-      deploymentInitiate: {
-        userErrors: [
-          {
-            message: "Error: cannot proceed with deployment."
-          }
-        ]
-      }
-    };
-    vi.mocked(graphqlRequest).mockResolvedValueOnce(response);
-    const deploymentInitData = {
-      buildId: void 0,
-      environment: { tag: "preview" },
-      manifest: testManifest
-    };
-    await expect(
-      deploymentInitiate({
-        config: testConfig,
-        input: deploymentInitData,
-        logger: stderrLogger
-      })
-    ).rejects.toThrow(
-      new AbortError(
-        `Failed to create deployment. ${response.deploymentInitiate.userErrors[0]?.message}`
-      )
-    );
-  });
-  test("should throw AbortError when unauthorized", async () => {
-    const error = {
-      statusCode: 401
-    };
-    vi.mocked(graphqlRequest).mockRejectedValueOnce(error);
-    try {
-      const deploymentInitData = {
-        buildId: void 0,
-        environment: { tag: "preview" },
-        manifest: testManifest
-      };
-      await expect(
-        deploymentInitiate({
-          config: testConfig,
-          input: deploymentInitData,
-          logger: stderrLogger
-        })
-      ).rejects.toThrow(
-        new AbortError(
-          "You are not authorized to perform this action. Please check your deployment token."
-        )
-      );
-    } catch (err) {
-      expect(error).toBeInstanceOf(AbortError);
-    }
-  });
-});

package/dist/deploy/get-upload-files.test.d.ts

@@ -1,2 +0,0 @@
-
-export { }