@shopify/oxygen-cli 4.3.8-unstable.202403291433.0 → 4.4.0

package/CHANGELOG.md

@@ -1,11 +1,28 @@
 # @shopify/oxygen-cli
 
+## 4.4.0
+
+### Minor Changes
+
+- 466c2f2: Update cli-kit and remove dotenv library
+
+  The updated cli-kit will support multiline environment variables inside `.env` files so we don't need to use an
+  external library anymore. Removing unused helper files.
+
+### Patch Changes
+
+- a373143: Update path-parse from 1.0.6 to 1.0.7
+- 69eee05: Update @types/node from 20.12.2 to 20.12.3
+- 3920af1: Update vite from 5.2.7 to 5.2.8
+
 ## 4.3.7
 
 ### Patch Changes
 
 - 641246a: Update vite from 5.2.6 to 5.2.7
 - 06cfa2a: Update oclif from 4.7.0 to 4.7.1
+- e2c4722: Update @types/node from 20.11.30 to 20.12.2
+- c28651a: Update oclif from 4.7.1 to 4.7.5
 
 ## 4.3.6
 

package/dist/commands/oxygen/deploy.js

@@ -1,10 +1,10 @@
 import { Command, Flags } from '@oclif/core';
 import { consoleError } from '@shopify/cli-kit/node/output';
 import { normalizePath } from '@shopify/cli-kit/node/path';
+import { readAndParseDotEnv } from '@shopify/cli-kit/node/dot-env';
 import { initializeBugsnag, getBugsnag } from '../../utils/bugsnag.js';
 import { createDeploy } from '../../deploy/index.js';
 import { deployDefaults, parseToken, verifyConfig, getBuildCommandFromLockFile } from '../../utils/utils.js';
-import { loadEnvironmentVariableFile } from '../../utils/dotenv.js';
 import { VerificationError } from '../../deploy/types.js';
 
 class Deploy extends Command {
@@ -122,7 +122,17 @@ class Deploy extends Command {
     try {
       const { flags } = await this.parse(Deploy);
       const rootPath = normalizePath(flags.path);
-      const overriddenEnvironmentVariables = flags.environmentFile ? loadEnvironmentVariableFile(flags.environmentFile) : void 0;
+      let overriddenEnvironmentVariables;
+      if (flags.environmentFile) {
+        const file = await readAndParseDotEnv(flags.environmentFile);
+        overriddenEnvironmentVariables = Object.entries(file.variables).map(
+          ([key, value]) => ({
+            isSecret: true,
+            key,
+            value
+          })
+        );
+      }
       initializeBugsnag(flags.disableBugsnag);
       const Bugsnag = getBugsnag();
       const deploymentUrl = (

package/dist/commands/oxygen/deploy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/commands/oxygen/deploy.ts"],"names":[],"mappings":"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","sourcesContent":["import {Command, Flags} from '@oclif/core';\nimport {consoleError} from '@shopify/cli-kit/node/output';\nimport {normalizePath} from '@shopify/cli-kit/node/path';\n\nimport {getBugsnag, initializeBugsnag} from '../../utils/bugsnag.js';\nimport {createDeploy} from '../../deploy/index.js';\nimport {\n  deployDefaults,\n  getBuildCommandFromLockFile,\n  parseToken,\n  verifyConfig,\n} from '../../utils/utils.js';\nimport {loadEnvironmentVariableFile} from '../../utils/dotenv.js';\nimport type {DeploymentConfig} from '../../deploy/types.js';\nimport {VerificationError} from '../../deploy/types.js';\n\nexport class Deploy extends Command {\n  static description = 'Creates a deployment to Oxygen';\n  static hidden = false;\n  static flags = {\n    assetsFolder: Flags.string({\n      char: 'a',\n      description: 'Assets folder',\n      default: String(deployDefaults.assetsDirDefault),\n      required: false,\n    }),\n    buildCommand: Flags.string({\n      char: 'b',\n      description: 'Build command',\n      required: false,\n      default: String(deployDefaults.buildCommandDefault!),\n      parse: (input): Promise<string> => {\n        this.hasCustomBuildCommand = true;\n        return Promise.resolve(input);\n      },\n    }),\n    disableBugsnag: Flags.boolean({\n      description: 'Disable Bugsnag error reporting',\n      required: false,\n      default: false,\n    }),\n    environmentTag: Flags.string({\n      char: 'e',\n      description: 'Tag of the environment to deploy to',\n      required: false,\n    }),\n    verificationMaxDuration: Flags.integer({\n      char: 'd',\n      description:\n        'the maximum duration (in seconds) that the deployment verification step is allowed to run before it is considered failed.',\n      min: 10,\n      max: 300,\n      required: false,\n      default: deployDefaults.verificationMaxDurationDefault as number,\n    }),\n    path: Flags.string({\n      char: 'p',\n      description: 'Root path',\n      default: './',\n      required: false,\n    }),\n    defaultEnvironment: Flags.boolean({\n      env: 'OXYGEN_DEFAULT_ENVIRONMENT',\n      description: 'Deploys to the default environment of the app',\n      required: false,\n      default: false,\n    }),\n    skipBuild: Flags.boolean({\n      char: 's',\n      description: 'Skip running build command',\n      required: false,\n      default: false,\n    }),\n    skipVerification: Flags.boolean({\n      char: 'v',\n      description: 'Skip running deployment verification step',\n      required: false,\n      default: false,\n    }),\n    token: Flags.string({\n      char: 't',\n      description: 'Oxygen deployment token',\n      env: 'OXYGEN_DEPLOYMENT_TOKEN',\n      required: true,\n    }),\n    workerFolder: Flags.string({\n      char: 'w',\n      description: 'Worker folder',\n      default: String(deployDefaults.workerDirDefault),\n      required: false,\n    }),\n    workerOnly: Flags.boolean({\n      char: 'o',\n      description: 'Worker only deployment',\n      default: false,\n      required: false,\n    }),\n    metadataDescription: Flags.string({\n      description:\n        'Description of the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_DESCRIPTION',\n    }),\n    metadataUrl: Flags.string({\n      description:\n        'URL that links to the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_URL',\n    }),\n    metadataUser: Flags.string({\n      description:\n        'User that initiated the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_USER',\n    }),\n    metadataVersion: Flags.string({\n      description:\n        'A version identifier for the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_VERSION',\n    }),\n    generateAuthBypassToken: Flags.boolean({\n      description:\n        'Generate an auth bypass token used to perform end-to-end testing against the deployment.',\n      required: false,\n      default: false,\n    }),\n    environmentFile: Flags.string({\n      description:\n        'Path to an environment file to override existing environment variables for the deployment.',\n      required: false,\n    }),\n  };\n\n  static hasCustomBuildCommand = false;\n\n  async run() {\n    try {\n      const {flags} = await this.parse(Deploy);\n      const rootPath = normalizePath(flags.path);\n      const overriddenEnvironmentVariables = flags.environmentFile\n        ? loadEnvironmentVariableFile(flags.environmentFile)\n        : undefined;\n\n      initializeBugsnag(flags.disableBugsnag);\n      const Bugsnag = getBugsnag();\n\n      const deploymentUrl =\n        // eslint-disable-next-line no-process-env\n        process.env.UNSAFE_OXYGEN_DEPLOYMENT_URL ||\n        'https://oxygen.shopifyapps.com';\n      Bugsnag?.addMetadata('flags', {\n        flags: {...flags, token: '***'},\n        deploymentUrl,\n      });\n\n      const config: DeploymentConfig = {\n        assetsDir: normalizePath(flags.assetsFolder),\n        bugsnag: !flags.disableBugsnag,\n        buildCommand: flags.buildCommand!,\n        deploymentToken: parseToken(flags.token!),\n        environmentTag: flags.environmentTag,\n        deploymentUrl,\n        verificationMaxDuration: flags.verificationMaxDuration,\n        metadata: {\n          description: flags.metadataDescription,\n          url: flags.metadataUrl,\n          user: flags.metadataUser,\n          version: flags.metadataVersion,\n        },\n        defaultEnvironment: flags.defaultEnvironment,\n        rootPath,\n        skipBuild: flags.skipBuild,\n        skipVerification: flags.skipVerification,\n        workerDir: normalizePath(flags.workerFolder),\n        workerOnly: flags.workerOnly,\n        generateAuthBypassToken: flags.generateAuthBypassToken,\n        overriddenEnvironmentVariables,\n      };\n\n      await verifyConfig({config});\n      if (!Deploy.hasCustomBuildCommand && !config.skipBuild) {\n        config.buildCommand = getBuildCommandFromLockFile(config);\n      }\n      await createDeploy({config});\n    } catch (error) {\n      const Bugsnag = getBugsnag();\n      if (Bugsnag && (error instanceof Error || typeof error === 'string')) {\n        Bugsnag.notify(error);\n      }\n\n      if (!(error instanceof Error)) {\n        consoleError(error as string);\n      } else if (!(error instanceof VerificationError)) {\n        consoleError(error.message);\n      }\n\n      this.exit(1);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../../../src/commands/oxygen/deploy.ts"],"names":[],"mappings":"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","sourcesContent":["import {Command, Flags} from '@oclif/core';\nimport {consoleError} from '@shopify/cli-kit/node/output';\nimport {normalizePath} from '@shopify/cli-kit/node/path';\nimport {readAndParseDotEnv} from '@shopify/cli-kit/node/dot-env';\n\nimport {getBugsnag, initializeBugsnag} from '../../utils/bugsnag.js';\nimport {createDeploy} from '../../deploy/index.js';\nimport {\n  deployDefaults,\n  getBuildCommandFromLockFile,\n  parseToken,\n  verifyConfig,\n} from '../../utils/utils.js';\nimport type {\n  DeploymentConfig,\n  EnvironmentVariable,\n} from '../../deploy/types.js';\nimport {VerificationError} from '../../deploy/types.js';\n\nexport class Deploy extends Command {\n  static description = 'Creates a deployment to Oxygen';\n  static hidden = false;\n  static flags = {\n    assetsFolder: Flags.string({\n      char: 'a',\n      description: 'Assets folder',\n      default: String(deployDefaults.assetsDirDefault),\n      required: false,\n    }),\n    buildCommand: Flags.string({\n      char: 'b',\n      description: 'Build command',\n      required: false,\n      default: String(deployDefaults.buildCommandDefault!),\n      parse: (input): Promise<string> => {\n        this.hasCustomBuildCommand = true;\n        return Promise.resolve(input);\n      },\n    }),\n    disableBugsnag: Flags.boolean({\n      description: 'Disable Bugsnag error reporting',\n      required: false,\n      default: false,\n    }),\n    environmentTag: Flags.string({\n      char: 'e',\n      description: 'Tag of the environment to deploy to',\n      required: false,\n    }),\n    verificationMaxDuration: Flags.integer({\n      char: 'd',\n      description:\n        'the maximum duration (in seconds) that the deployment verification step is allowed to run before it is considered failed.',\n      min: 10,\n      max: 300,\n      required: false,\n      default: deployDefaults.verificationMaxDurationDefault as number,\n    }),\n    path: Flags.string({\n      char: 'p',\n      description: 'Root path',\n      default: './',\n      required: false,\n    }),\n    defaultEnvironment: Flags.boolean({\n      env: 'OXYGEN_DEFAULT_ENVIRONMENT',\n      description: 'Deploys to the default environment of the app',\n      required: false,\n      default: false,\n    }),\n    skipBuild: Flags.boolean({\n      char: 's',\n      description: 'Skip running build command',\n      required: false,\n      default: false,\n    }),\n    skipVerification: Flags.boolean({\n      char: 'v',\n      description: 'Skip running deployment verification step',\n      required: false,\n      default: false,\n    }),\n    token: Flags.string({\n      char: 't',\n      description: 'Oxygen deployment token',\n      env: 'OXYGEN_DEPLOYMENT_TOKEN',\n      required: true,\n    }),\n    workerFolder: Flags.string({\n      char: 'w',\n      description: 'Worker folder',\n      default: String(deployDefaults.workerDirDefault),\n      required: false,\n    }),\n    workerOnly: Flags.boolean({\n      char: 'o',\n      description: 'Worker only deployment',\n      default: false,\n      required: false,\n    }),\n    metadataDescription: Flags.string({\n      description:\n        'Description of the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_DESCRIPTION',\n    }),\n    metadataUrl: Flags.string({\n      description:\n        'URL that links to the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_URL',\n    }),\n    metadataUser: Flags.string({\n      description:\n        'User that initiated the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_USER',\n    }),\n    metadataVersion: Flags.string({\n      description:\n        'A version identifier for the deployment. Will be saved and displayed in the Shopify admin',\n      required: false,\n      env: 'OXYGEN_METADATA_VERSION',\n    }),\n    generateAuthBypassToken: Flags.boolean({\n      description:\n        'Generate an auth bypass token used to perform end-to-end testing against the deployment.',\n      required: false,\n      default: false,\n    }),\n    environmentFile: Flags.string({\n      description:\n        'Path to an environment file to override existing environment variables for the deployment.',\n      required: false,\n    }),\n  };\n\n  static hasCustomBuildCommand = false;\n\n  async run() {\n    try {\n      const {flags} = await this.parse(Deploy);\n      const rootPath = normalizePath(flags.path);\n\n      let overriddenEnvironmentVariables: EnvironmentVariable[] | undefined;\n\n      if (flags.environmentFile) {\n        const file = await readAndParseDotEnv(flags.environmentFile);\n\n        overriddenEnvironmentVariables = Object.entries(file.variables).map(\n          ([key, value]) => ({\n            isSecret: true,\n            key,\n            value,\n          }),\n        );\n      }\n\n      initializeBugsnag(flags.disableBugsnag);\n      const Bugsnag = getBugsnag();\n\n      const deploymentUrl =\n        // eslint-disable-next-line no-process-env\n        process.env.UNSAFE_OXYGEN_DEPLOYMENT_URL ||\n        'https://oxygen.shopifyapps.com';\n      Bugsnag?.addMetadata('flags', {\n        flags: {...flags, token: '***'},\n        deploymentUrl,\n      });\n\n      const config: DeploymentConfig = {\n        assetsDir: normalizePath(flags.assetsFolder),\n        bugsnag: !flags.disableBugsnag,\n        buildCommand: flags.buildCommand!,\n        deploymentToken: parseToken(flags.token!),\n        environmentTag: flags.environmentTag,\n        deploymentUrl,\n        verificationMaxDuration: flags.verificationMaxDuration,\n        metadata: {\n          description: flags.metadataDescription,\n          url: flags.metadataUrl,\n          user: flags.metadataUser,\n          version: flags.metadataVersion,\n        },\n        defaultEnvironment: flags.defaultEnvironment,\n        rootPath,\n        skipBuild: flags.skipBuild,\n        skipVerification: flags.skipVerification,\n        workerDir: normalizePath(flags.workerFolder),\n        workerOnly: flags.workerOnly,\n        generateAuthBypassToken: flags.generateAuthBypassToken,\n        overriddenEnvironmentVariables,\n      };\n\n      await verifyConfig({config});\n      if (!Deploy.hasCustomBuildCommand && !config.skipBuild) {\n        config.buildCommand = getBuildCommandFromLockFile(config);\n      }\n      await createDeploy({config});\n    } catch (error) {\n      const Bugsnag = getBugsnag();\n      if (Bugsnag && (error instanceof Error || typeof error === 'string')) {\n        Bugsnag.notify(error);\n      }\n\n      if (!(error instanceof Error)) {\n        consoleError(error as string);\n      } else if (!(error instanceof VerificationError)) {\n        consoleError(error.message);\n      }\n\n      this.exit(1);\n    }\n  }\n}\n"]}

package/oclif.manifest.json

@@ -183,5 +183,5 @@
       ]
     }
   },
-  "version": "4.3.8-unstable.202403291433.0"
+  "version": "4.4.0"
 }

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "4.3.8-unstable.202403291433.0",
+  "version": "4.4.0",
   "type": "module",
   "scripts": {
     "build": "tsup --sourcemap --clean --config ./tsup.config.ts && oclif manifest",
@@ -28,8 +28,7 @@
     "node": ">=18.12.0"
   },
   "exports": {
-    "./deploy": "./dist/deploy/index.js",
-    "./utils": "./dist/utils/index.js"
+    "./deploy": "./dist/deploy/index.js"
   },
   "files": [
     "dist",
@@ -40,12 +39,11 @@
     "@bugsnag/core": "^7.19.0",
     "@bugsnag/js": "^7.22.4",
     "@bugsnag/node": "^7.19.0",
-    "async": "^3.2.5",
-    "dotenv": "^16.4.5"
+    "async": "^3.2.5"
   },
   "peerDependencies": {
     "@oclif/core": "^3.15.1",
-    "@shopify/cli-kit": "^3.56.2"
+    "@shopify/cli-kit": "^3.58.0"
   },
   "devDependencies": {
     "@bugsnag/source-maps": "^2.3.2",
@@ -53,14 +51,14 @@
     "@shopify/eslint-plugin": "^44.0.0",
     "@shopify/prettier-config": "^1.1.2",
     "@types/async": "^3.2.24",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.3",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "^5.1.3",
     "node-fetch": "^3.3.2",
     "oclif": "^4",
     "tsup": "^8.0.2",
     "typescript": "^5.4.3",
-    "vite": "^5.2.7",
+    "vite": "^5.2.8",
     "vitest": "^1.4.0"
   },
   "prettier": "@shopify/prettier-config",

package/dist/utils/dotenv.d.ts

@@ -1,7 +0,0 @@
-import { EnvironmentVariable } from '../deploy/types.js';
-import '../deploy/graphql/deployment-verification-details.js';
-
-declare function loadEnvironmentVariableFile(path: string): EnvironmentVariable[];
-declare function parseDotEnvFile(path: string): Record<string, string>;
-
-export { loadEnvironmentVariableFile, parseDotEnvFile };

package/dist/utils/dotenv.js

@@ -1,21 +0,0 @@
-import fs from 'fs';
-import * as dotenv from 'dotenv';
-
-function loadEnvironmentVariableFile(path) {
-  return Object.entries(parseDotEnvFile(path)).map(([key, value]) => ({
-    isSecret: true,
-    key,
-    value
-  }));
-}
-function parseDotEnvFile(path) {
-  if (!fs.existsSync(path) || !fs.lstatSync(path).isFile()) {
-    throw new Error(`Environment file not found: ${path}`);
-  }
-  const file = fs.readFileSync(path, "utf8");
-  return dotenv.parse(file);
-}
-
-export { loadEnvironmentVariableFile, parseDotEnvFile };
-//# sourceMappingURL=out.js.map
-//# sourceMappingURL=dotenv.js.map

package/dist/utils/dotenv.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/dotenv.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ;AAEf,YAAY,YAAY;AAIjB,SAAS,4BACd,MACuB;AAGvB,SAAO,OAAO,QAAQ,gBAAgB,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,OAAO;AAAA,IAClE,UAAU;AAAA,IACV;AAAA,IACA;AAAA,EACF,EAAE;AACJ;AAEO,SAAS,gBAAgB,MAAsC;AACpE,MAAI,CAAC,GAAG,WAAW,IAAI,KAAK,CAAC,GAAG,UAAU,IAAI,EAAE,OAAO,GAAG;AACxD,UAAM,IAAI,MAAM,+BAA+B,IAAI,EAAE;AAAA,EACvD;AAEA,QAAM,OAAO,GAAG,aAAa,MAAM,MAAM;AACzC,SAAO,OAAO,MAAM,IAAI;AAC1B","sourcesContent":["import fs from 'fs';\n\nimport * as dotenv from 'dotenv';\n\nimport {EnvironmentVariable} from '../deploy/types.js';\n\nexport function loadEnvironmentVariableFile(\n  path: string,\n): EnvironmentVariable[] {\n  // We are forcing every environment variable passed in by the merchant to be secret.\n  // This will only affect the privacy setting of the environment variable on Cloudflare\n  return Object.entries(parseDotEnvFile(path)).map(([key, value]) => ({\n    isSecret: true,\n    key,\n    value,\n  }));\n}\n\nexport function parseDotEnvFile(path: string): Record<string, string> {\n  if (!fs.existsSync(path) || !fs.lstatSync(path).isFile()) {\n    throw new Error(`Environment file not found: ${path}`);\n  }\n\n  const file = fs.readFileSync(path, 'utf8');\n  return dotenv.parse(file);\n}\n"]}

package/dist/utils/index.d.ts

@@ -1,3 +0,0 @@
-export { loadEnvironmentVariableFile, parseDotEnvFile } from './dotenv.js';
-import '../deploy/types.js';
-import '../deploy/graphql/deployment-verification-details.js';

package/dist/utils/index.js

@@ -1,3 +0,0 @@
-export { loadEnvironmentVariableFile, parseDotEnvFile } from './dotenv.js';
-//# sourceMappingURL=out.js.map
-//# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,SAAQ,6BAA6B,uBAAsB","sourcesContent":["export {loadEnvironmentVariableFile, parseDotEnvFile} from './dotenv.js';\n"]}