netlify-cli 17.18.1 → 17.19.0

package/dist/commands/blobs/blobs-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blobs-list.d.ts","sourceRoot":"","sources":["../../../src/commands/blobs/blobs-list.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,UAAU,OAAQ,SAAQ,YAAY;IACpC,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,SAAS,cAAqB,MAAM,WAAW,OAAO,WAAW,WAAW,kBAqCxF,CAAA"}
+{"version":3,"file":"blobs-list.d.ts","sourceRoot":"","sources":["../../../src/commands/blobs/blobs-list.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,UAAU,OAAQ,SAAQ,YAAY;IACpC,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,SAAS,cAAqB,MAAM,WAAW,OAAO,WAAW,WAAW,kBAuCxF,CAAA"}

package/dist/commands/blobs/blobs-list.js

@@ -15,8 +15,10 @@ export const blobsList = async (storeName, options, command) => {
             prefix: options.prefix,
         });
         if (options.json) {
-            logJson({ blobs, directories });
-            return;
+            return logJson({ blobs, directories });
+        }
+        if (blobs.length === 0 && directories.length === 0) {
+            return log(`Netlify Blobs store ${chalk.yellow(storeName)} is empty`);
         }
         const table = new AsciiTable(`Netlify Blobs (${storeName})`);
         table.setHeading('Key', 'ETag');

package/dist/commands/recipes/recipes.d.ts

@@ -1,9 +1,13 @@
 import { OptionValues } from 'commander';
 import BaseCommand from '../base-command.js';
-export declare const runRecipe: ({ config, recipeName, repositoryRoot }: {
-    config: any;
-    recipeName: any;
-    repositoryRoot: any;
-}) => Promise<any>;
+interface RunRecipeOptions {
+    args: string[];
+    command?: BaseCommand;
+    config: unknown;
+    recipeName: string;
+    repositoryRoot: string;
+}
+export declare const runRecipe: ({ args, command, config, recipeName, repositoryRoot }: RunRecipeOptions) => Promise<any>;
 export declare const recipesCommand: (recipeName: string, options: OptionValues, command: BaseCommand) => Promise<any>;
+export {};
 //# sourceMappingURL=recipes.d.ts.map

package/dist/commands/recipes/recipes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recipes.d.ts","sourceRoot":"","sources":["../../../src/commands/recipes/recipes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAO5C,eAAO,MAAM,SAAS;;;;kBAIrB,CAAA;AAED,eAAO,MAAM,cAAc,eAAsB,MAAM,WAAW,YAAY,WAAW,WAAW,KAAG,QAAQ,GAAG,CA8CjH,CAAA"}
+{"version":3,"file":"recipes.d.ts","sourceRoot":"","sources":["../../../src/commands/recipes/recipes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAM5C,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,OAAO,CAAC,EAAE,WAAW,CAAA;IACrB,MAAM,EAAE,OAAO,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,SAAS,0DAAiE,gBAAgB,iBAItG,CAAA;AAED,eAAO,MAAM,cAAc,eAAsB,MAAM,WAAW,YAAY,WAAW,WAAW,KAAG,QAAQ,GAAG,CAgDjH,CAAA"}

package/dist/commands/recipes/recipes.js

@@ -4,10 +4,9 @@ import inquirer from 'inquirer';
 import { NETLIFYDEVERR, chalk, log } from '../../utils/command-helpers.js';
 import { getRecipe, listRecipes } from './common.js';
 const SUGGESTION_TIMEOUT = 1e4;
-// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-export const runRecipe = async ({ config, recipeName, repositoryRoot }) => {
+export const runRecipe = async ({ args, command, config, recipeName, repositoryRoot }) => {
     const recipe = await getRecipe(recipeName);
-    return recipe.run({ config, repositoryRoot });
+    return recipe.run({ args, command, config, repositoryRoot });
 };
 export const recipesCommand = async (recipeName, options, command) => {
     const { config, repositoryRoot } = command.netlify;
@@ -15,8 +14,9 @@ export const recipesCommand = async (recipeName, options, command) => {
     if (sanitizedRecipeName.length === 0) {
         return command.help();
     }
+    const args = command.args.slice(1);
     try {
-        return await runRecipe({ config, recipeName: sanitizedRecipeName, repositoryRoot });
+        return await runRecipe({ args, command, config, recipeName: sanitizedRecipeName, repositoryRoot });
     }
     catch (error) {
         if (

package/dist/lib/blobs/blobs.js

@@ -1,6 +1,6 @@
 import { Buffer } from 'buffer';
 import path from 'path';
-import { BlobsServer } from '@netlify/blobs';
+import { BlobsServer } from '@netlify/blobs/server';
 import { v4 as uuidv4 } from 'uuid';
 import { log, NETLIFYDEVLOG } from '../../utils/command-helpers.js';
 import { getPathInProject } from '../settings.js';

package/dist/lib/edge-functions/editor-helper.js

@@ -26,5 +26,5 @@ export const promptEditorHelper = async ({ NETLIFYDEVLOG, chalk, config, log, re
         log(`${NETLIFYDEVLOG} You can start this configuration manually by running ${chalk.magenta.bold('netlify recipes vscode')}.`);
         return;
     }
-    await runRecipe({ config, recipeName: 'vscode', repositoryRoot });
+    await runRecipe({ args: [], config, recipeName: 'vscode', repositoryRoot });
 };

package/dist/recipes/blobs-migrate/index.d.ts

@@ -0,0 +1,9 @@
+import BaseCommand from '../../commands/base-command.js';
+export declare const description = "Migrate legacy Netlify Blobs stores";
+interface Options {
+    args: string[];
+    command: BaseCommand;
+}
+export declare const run: ({ args, command }: Options) => Promise<void>;
+export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/recipes/blobs-migrate/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/recipes/blobs-migrate/index.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AAGxD,eAAO,MAAM,WAAW,wCAAwC,CAAA;AAIhE,UAAU,OAAO;IACf,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,eAAO,MAAM,GAAG,sBAA6B,OAAO,kBA0FnD,CAAA"}

package/dist/recipes/blobs-migrate/index.js

@@ -0,0 +1,76 @@
+import { getStore, listStores } from '@netlify/blobs';
+import inquirer from 'inquirer';
+import pMap from 'p-map';
+import { error, log } from '../../utils/command-helpers.js';
+export const description = 'Migrate legacy Netlify Blobs stores';
+const BLOB_OPS_CONCURRENCY = 5;
+export const run = async ({ args, command }) => {
+    if (args.length !== 1) {
+        return error(`Usage: netlify recipes blobs-migrate <name of store>`);
+    }
+    const [storeName] = args;
+    const { api, siteInfo } = command.netlify;
+    const clientOptions = {
+        apiURL: `${api.scheme}://${api.host}`,
+        siteID: siteInfo?.id ?? '',
+        token: api.accessToken ?? '',
+    };
+    // The store we'll copy from.
+    const oldStore = getStore({
+        ...clientOptions,
+        name: `netlify-internal/legacy-namespace/${storeName}`,
+    });
+    // The store we'll write to.
+    const newStore = getStore({
+        ...clientOptions,
+        name: storeName,
+    });
+    const { blobs } = await oldStore.list();
+    if (blobs.length === 0) {
+        return log(`Store '${storeName}' does not exist or is empty, so there's nothing to migrate.`);
+    }
+    const { stores } = await listStores(clientOptions);
+    if (stores.includes(storeName)) {
+        const { confirmExistingStore } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'confirmExistingStore',
+            message: `The store '${storeName}' already exists in the new format, which means it has already been migrated or it has been used with a newer version of the Netlify Blobs client. If you continue with the migration, any blobs from the legacy store will overwrite newer entries that have the same key. Do you want to proceed?`,
+            default: false,
+        });
+        if (!confirmExistingStore) {
+            return;
+        }
+    }
+    const { confirmMigration } = await inquirer.prompt({
+        type: 'confirm',
+        name: 'confirmMigration',
+        message: `You're about to migrate the store '${storeName}' with ${blobs.length} blobs. Do you want to proceed?`,
+        default: true,
+    });
+    if (!confirmMigration) {
+        return;
+    }
+    await pMap(blobs, async (blob) => {
+        log(`Migrating blob with key '${blob.key}'...`);
+        const result = await oldStore.getWithMetadata(blob.key);
+        if (result === null) {
+            return;
+        }
+        await newStore.set(blob.key, result.data, { metadata: result.metadata });
+    }, { concurrency: BLOB_OPS_CONCURRENCY });
+    log('Verifying data in the new store...');
+    const { blobs: newBlobs } = await newStore.list();
+    const blobsMap = new Map(newBlobs.map((blob) => [blob.key, blob.etag]));
+    // Before deleting anything, let's first verify that all entries that exist
+    // in the old store are now also on the new store, with the same etag.
+    if (!blobs.every((blob) => blobsMap.get(blob.key) === blob.etag)) {
+        return error(`Failed to migrate some blobs. Try running the command again.`);
+    }
+    try {
+        await pMap(blobs, (blob) => oldStore.delete(blob.key), { concurrency: BLOB_OPS_CONCURRENCY });
+    }
+    catch {
+        return error('Failed to remove legacy store after migration. Try running the command again.');
+    }
+    log(`Store '${storeName}' has been migrated successfully.`);
+};