Merge branch 'kats/s3'

Author: harmony7

README.md

@@ -153,7 +153,7 @@ Before publishing your content, your S3-compatible bucket must already exist.
 Type the following:
 
 ```sh
-npm run publish
+npm run s3:publish
 ```
 
 #### 3. Preview Locally
@@ -541,7 +541,7 @@ Before publishing your content, your S3-compatible bucket must already exist.
 Publish your content by typing:
 
 ```sh
-npm run publish
+npm run s3:publish
 ```
 
 Then start the local development server:
@@ -565,7 +565,7 @@ When you're ready for production:
 Once deployed, publish content like so:
 
 ```sh
-npm run publish
+npm run s3:publish
 ```
 
 This:
@@ -577,7 +577,7 @@ This:
 > [!TIP]
 > Upload to a specific collection by specifying the collection name when publishing content:
 > ```sh
-> npm run publish -- --collection-name=preview-42
+> npm run s3:publish -- --collection-name=preview-42
 > ```
 
 **No Wasm redeploy needed** unless you:

src/cli/commands/manage/publish-content.ts

@@ -393,28 +393,31 @@ export async function action(actionArgs: string[]) {
       let variantMetadata = variantMetadatas.get(variant);
       if (variantMetadata != null) {
 
-        console.log(` 🏃‍♂️ Asset "${variantKey}" is identical to an item we already know about, reusing existing copy.`);
+        if (verbose) {
+          console.log(` 🏃‍♂️ Asset "${variantKey}" is identical to an item we already know about, reusing existing copy.`);
+        }
 
       } else {
 
         if (!overwriteExisting) {
           const assetVariantMetadata = await storageProvider.getExistingAssetVariant(variantKey);
           if (assetVariantMetadata != null) {
-            console.log(` ・ Asset found in storage with key "${variantKey}".`);
+            if (verbose) {
+              console.log(` ・ Asset found in storage with key "${variantKey}".`);
+            }
             // And we already know its hash and size.
             variantMetadata = Object.assign(assetVariantMetadata, { existsInKvStore: true });
           }
         }
 
         if (variantMetadata == null) {
+          console.log(` ↦ Prepping new asset for storage: "${variantKey}"`);
           await ensureVariantFileExists(
             variantFilePath,
             variant,
             file,
+            verbose,
           );
-          if (localMode) {
-            console.log(` ・ Prepping asset for storage with key "${variantKey}".`);
-          }
 
           let contentEncoding, hash, size;
           if (variant === 'original') {

src/cli/commands/scaffold/index.ts

@@ -780,7 +780,7 @@ export async function action(actionArgs: string[]) {
     packageJsonScripts['dev:publish'] = 'npx @fastly/compute-js-static-publish publish-content --local';
     packageJsonScripts['fastly:publish'] = 'npx @fastly/compute-js-static-publish publish-content';
   } else if (storageMode === 's3') {
-    packageJsonScripts['publish'] = 'npx @fastly/compute-js-static-publish publish-content --local';
+    packageJsonScripts['s3:publish'] = 'npx @fastly/compute-js-static-publish publish-content';
   }
   resourceFiles['package.json'] = JSON.stringify({
     name,
@@ -1038,11 +1038,11 @@ To publish your content to your S3-compatible bucket
 
   Using an AWS profile set with "aws configure", type:
     cd ${COMPUTE_JS_DIR}
-    AWS_PROFILE=xxxx npm run publish
+    AWS_PROFILE=xxxx npm run s3:publish
 
   Using AWS IAM credentials, type:
     cd ${COMPUTE_JS_DIR}
-    AWS_ACCESS_KEY_ID=xxxx AWS_SECRET_ACCESS_KEY=xxxx npm run publish
+    AWS_ACCESS_KEY_ID=xxxx AWS_SECRET_ACCESS_KEY=xxxx npm run s3:publish
 
 To run your Compute application locally
 

src/cli/util/variants.ts

@@ -14,6 +14,7 @@ export async function ensureVariantFileExists(
   variantFilePath: string,
   variant: Variants,
   file: string,
+  verbose: boolean,
 ) {
 
   // Compress/prepare the asset if it doesn't already exist
@@ -23,13 +24,17 @@ export async function ensureVariantFileExists(
     if (variant === 'original') {
 
       fs.cpSync(file, variantFilePath);
-      console.log(` 📄→📄 Copied file '${rootRelative(file)}' to '${rootRelative(variantFilePath)}'.`);
+      if (verbose) {
+        console.log(` 📄→📄 Copied file '${rootRelative(file)}' to '${rootRelative(variantFilePath)}'.`);
+      }
 
     } else {
 
       const compressTo = algs[variant];
       await compressTo(file, variantFilePath);
-      console.log(` 📄→🗄️ Compressed file '${rootRelative(file)}' to '${rootRelative(variantFilePath)}' [${variant}].`);
+      if (verbose) {
+        console.log(` 📄→🗄️ Compressed file '${rootRelative(file)}' to '${rootRelative(variantFilePath)}' [${variant}].`);
+      }
 
     }