@granite-js/forge-cli 0.1.0 → 0.1.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @granite-js/forge-cli
 
+## 0.1.1
+
+### Patch Changes
+
+- d675415: Improve scaffolding to provide a better showcase UI
+- 7f0afd4: Updated forge-cli to support reading AWS configuration files when available, instead of relying solely on environment variables.
+- 10a5f3f: empty
+- Updated dependencies [d675415]
+- Updated dependencies [10a5f3f]
+  - @granite-js/deployment-manager@0.1.1
+  - @granite-js/cli@0.1.1
+
 ## 0.1.0
 
 ### Minor Changes

package/dist/index.js

@@ -1,5 +1,7 @@
 import { Command } from "@commander-js/extra-typings";
 import path from "path";
+import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
+import { loadSharedConfigFiles } from "@aws-sdk/shared-ini-file-loader";
 import * as p$3 from "@clack/prompts";
 import * as p$2 from "@clack/prompts";
 import * as p$1 from "@clack/prompts";
@@ -150,14 +152,19 @@ const envSchema = v.object({
 	AWS_SECRET_ACCESS_KEY: v.string(),
 	AWS_SESSION_TOKEN: v.optional(v.string())
 });
+const awsCredentialsProvider = fromNodeProviderChain();
 function deploy() {
 	return new Command("deploy").description("Deploy a Granite application").requiredOption("--bucket <BUCKET>", "AWS bucket").action(async (options) => {
-		const config = await loadConfig();
+		const [config, awsCredentials, region] = await Promise.all([
+			loadConfig(),
+			awsCredentialsProvider(),
+			getRegion()
+		]);
 		const envResult = v.safeParse(envSchema, {
-			AWS_REGION: process.env.AWS_REGION,
-			AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID,
-			AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY,
-			AWS_SESSION_TOKEN: process.env.AWS_SESSION_TOKEN
+			AWS_REGION: region,
+			AWS_ACCESS_KEY_ID: awsCredentials.accessKeyId,
+			AWS_SECRET_ACCESS_KEY: awsCredentials.secretAccessKey,
+			AWS_SESSION_TOKEN: awsCredentials.sessionToken
 		});
 		if (!envResult.success) {
 			const missingVars = envResult.issues.map((issue) => {
@@ -173,7 +180,7 @@ function deploy() {
 			iosBundle: path.join(config.outdir, `bundle.ios.hbc`),
 			androidBundle: path.join(config.outdir, `bundle.android.hbc`)
 		}, { s3Client: new S3Client({
-			region: envResult.output.AWS_REGION,
+			region,
 			bucket: options.bucket,
 			credentials: {
 				accessKeyId: envResult.output.AWS_ACCESS_KEY_ID,
@@ -183,6 +190,18 @@ function deploy() {
 		}) });
 	});
 }
+async function getRegion() {
+	const { configFile } = await loadSharedConfigFiles();
+	const envRegion = process.env.AWS_REGION;
+	if (envRegion != null) return envRegion;
+	const currentProfile = process.env.AWS_PROFILE;
+	if (currentProfile != null) {
+		const region = configFile?.[currentProfile]?.region;
+		if (region != null) return region;
+	}
+	const defaultRegion = configFile.default?.region;
+	return defaultRegion;
+}
 
 //#endregion
 //#region src/helpers/command.ts

package/package.json

@@ -2,7 +2,7 @@
   "name": "@granite-js/forge-cli",
   "description": "A CLI tool for managing Granite applications",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "bin": {
     "granite-forge": "./bin/index.js"
   },
@@ -24,10 +24,12 @@
     "vitest": "^3.1.4"
   },
   "dependencies": {
+    "@aws-sdk/credential-providers": "^3.817.0",
+    "@aws-sdk/shared-ini-file-loader": "^3.374.0",
     "@clack/prompts": "^0.10.1",
     "@commander-js/extra-typings": "^14.0.0",
-    "@granite-js/cli": "0.1.0",
-    "@granite-js/deployment-manager": "0.1.0",
+    "@granite-js/cli": "0.1.1",
+    "@granite-js/deployment-manager": "0.1.1",
     "commander": "^14.0.0",
     "uuid": "^11.1.0",
     "valibot": "^1.1.0"