netlify-cli 17.23.5 → 17.23.7

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAMxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C;;GAEG;AAEH,eAAO,MAAM,YAAY;;;;;UAWxB,CAAA;AAYD,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,kBAiCtE,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAMxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C;;GAEG;AAEH,eAAO,MAAM,YAAY;;;;;UAWxB,CAAA;AAED,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,kBAoCtE,CAAA"}

package/dist/commands/build/build.js

@@ -15,14 +15,6 @@ export const checkOptions = ({ cachedConfig: { siteInfo = {} }, token }) => {
         error('Could not find the access token. Please run netlify login.');
     }
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'command' implicitly has an 'any' type.
-const injectEnv = async function (command, { api, buildOptions, context, siteInfo }) {
-    const isUsingEnvelope = siteInfo && siteInfo.use_envelope;
-    const { env } = buildOptions.cachedConfig;
-    if (isUsingEnvelope) {
-        buildOptions.cachedConfig.env = await getEnvelopeEnv({ api, context, env, siteInfo });
-    }
-};
 export const build = async (options, command) => {
     const { cachedConfig, siteInfo } = command.netlify;
     command.setAnalyticsPayload({ dry: options.dry });
@@ -45,10 +37,12 @@ export const build = async (options, command) => {
     });
     if (!options.offline) {
         checkOptions(buildOptions);
-        const { api, site } = command.netlify;
-        const { context } = options;
-        // @ts-expect-error TS(2345) FIXME: Argument of type '{ api: any; buildOptions: { cach... Remove this comment to see the full error message
-        await injectEnv(command, { api, buildOptions, context, site, siteInfo });
+        buildOptions.cachedConfig.env = await getEnvelopeEnv({
+            api: command.netlify.api,
+            context: options.context,
+            env: buildOptions.cachedConfig.env,
+            siteInfo,
+        });
     }
     const { exitCode } = await runBuild(buildOptions);
     exit(exitCode);

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAgCxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAuuB5C,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAmHvE,CAAA"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAgCxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAouB5C,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAmHvE,CAAA"}

package/dist/commands/deploy/deploy.js

@@ -14,7 +14,7 @@ import { featureFlags as edgeFunctionsFeatureFlags } from '../../lib/edge-functi
 import { normalizeFunctionsConfig } from '../../lib/functions/config.js';
 import { BACKGROUND_FUNCTIONS_WARNING } from '../../lib/log.js';
 import { startSpinner, stopSpinner } from '../../lib/spinner.js';
-import { chalk, error, exit, getToken, log, logJson, NETLIFYDEV, NETLIFYDEVERR, NETLIFYDEVLOG, warn, } from '../../utils/command-helpers.js';
+import { NETLIFYDEV, NETLIFYDEVERR, NETLIFYDEVLOG, chalk, error, exit, getToken, log, logJson, warn, } from '../../utils/command-helpers.js';
 import { DEFAULT_DEPLOY_TIMEOUT } from '../../utils/deploy/constants.js';
 import { deploySite } from '../../utils/deploy/deploy-site.js';
 import { getEnvelopeEnv } from '../../utils/env/index.js';
@@ -566,9 +566,8 @@ siteId,
 // @ts-expect-error TS(7031) FIXME: Binding element 'workingDir' implicitly has an 'an... Remove this comment to see the full error message
 workingDir, }) => {
     const alias = options.alias || options.branch;
-    const isUsingEnvelope = siteData && siteData.use_envelope;
     // if a context is passed besides dev, we need to pull env vars from that specific context
-    if (isUsingEnvelope && options.context && options.context !== 'dev') {
+    if (options.context && options.context !== 'dev') {
         command.netlify.cachedConfig.env = await getEnvelopeEnv({
             api,
             context: options.context,
@@ -593,16 +592,14 @@ workingDir, }) => {
         deployFolder,
         functionsFolder,
     });
-    const siteEnv = isUsingEnvelope
-        ? await getEnvelopeEnv({
-            api,
-            context: options.context,
-            env: command.netlify.cachedConfig.env,
-            raw: true,
-            scope: 'functions',
-            siteInfo: siteData,
-        })
-        : siteData?.build_settings?.env;
+    const siteEnv = await getEnvelopeEnv({
+        api,
+        context: options.context,
+        env: command.netlify.cachedConfig.env,
+        raw: true,
+        scope: 'functions',
+        siteInfo: siteData,
+    });
     const functionsConfig = normalizeFunctionsConfig({
         functionsConfig: config.functions,
         projectRoot: site.root,

package/dist/commands/dev/dev-exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-exec.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,eAAO,MAAM,OAAO,QAAe,MAAM,WAAW,YAAY,WAAW,WAAW,kBAcrF,CAAA;AAED,eAAO,MAAM,oBAAoB,YAAa,WAAW,gBAerC,CAAA"}
+{"version":3,"file":"dev-exec.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,eAAO,MAAM,OAAO,QAAe,MAAM,WAAW,YAAY,WAAW,WAAW,kBAWrF,CAAA;AAED,eAAO,MAAM,oBAAoB,YAAa,WAAW,gBAerC,CAAA"}

package/dist/commands/dev/dev-exec.js

@@ -3,12 +3,9 @@ import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.js';
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.js';
 export const devExec = async (cmd, options, command) => {
     const { api, cachedConfig, config, site, siteInfo } = command.netlify;
-    let { env } = cachedConfig;
-    if (siteInfo.use_envelope) {
-        env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo });
-    }
-    env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site });
-    injectEnvVariables(env);
+    const withEnvelopeEnvVars = await getEnvelopeEnv({ api, context: options.context, env: cachedConfig.env, siteInfo });
+    const withDotEnvVars = await getDotEnvVariables({ devConfig: { ...config.dev }, env: withEnvelopeEnvVars, site });
+    injectEnvVariables(withDotEnvVars);
     await execa(cmd, command.args.slice(1), {
         stdio: 'inherit',
     });

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

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAU,MAAM,WAAW,CAAA;AA0BhD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4D5C,eAAO,MAAM,GAAG,YAAmB,YAAY,WAAW,WAAW,kBA0JpE,CAAA;AAED,eAAO,MAAM,gBAAgB,YAAa,WAAW,gBA8GpD,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,YAAY,EAAE,MAAM,WAAW,CAAA;AA0BhD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4D5C,eAAO,MAAM,GAAG,YAAmB,YAAY,WAAW,WAAW,kBA0JpE,CAAA;AAED,eAAO,MAAM,gBAAgB,YAAa,WAAW,gBA8GpD,CAAA"}

package/dist/commands/dev/dev.js

@@ -6,9 +6,9 @@ import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContextWithEdgeAcce
 import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
-import { BANG, chalk, log, NETLIFYDEV, NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, normalizeConfig, } from '../../utils/command-helpers.js';
+import { BANG, NETLIFYDEV, NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, log, normalizeConfig, } from '../../utils/command-helpers.js';
 import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.js';
-import { getDotEnvVariables, getSiteInformation, injectEnvVariables, UNLINKED_SITE_MOCK_ID } from '../../utils/dev.js';
+import { UNLINKED_SITE_MOCK_ID, getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.js';
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.js';
 import { ensureNetlifyIgnore } from '../../utils/gitignore.js';
 import { getLiveTunnelSlug, startLiveTunnel } from '../../utils/live-tunnel.js';
@@ -84,7 +84,7 @@ export const dev = async (options, command) => {
         siteID: site.id ?? UNLINKED_SITE_MOCK_ID,
     });
     env[BLOBS_CONTEXT_VARIABLE] = { sources: ['internal'], value: encodeBlobsContext(blobsContext) };
-    if (!options.offline && siteInfo.use_envelope) {
+    if (!options.offline) {
         env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo });
         log(`${NETLIFYDEVLOG} Injecting environment variable values for ${chalk.yellow('all scopes')}`);
     }

package/dist/commands/env/env-clone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-clone.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAgK5C,eAAO,MAAM,QAAQ,YAAmB,YAAY,WAAW,WAAW,qBAkDzE,CAAA"}
+{"version":3,"file":"env-clone.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAkD5C,eAAO,MAAM,QAAQ,YAAmB,YAAY,WAAW,WAAW,qBAuCzE,CAAA"}

package/dist/commands/env/env-clone.js

@@ -1,5 +1,4 @@
-import { chalk, error as logError, log } from '../../utils/command-helpers.js';
-import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.js';
+import { chalk, log, error as logError } from '../../utils/command-helpers.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 const safeGetSite = async (api, siteId) => {
     try {
@@ -10,41 +9,12 @@ const safeGetSite = async (api, siteId) => {
         return { error };
     }
 };
-/**
- * Copies the env from a site configured with Envelope to a site not configured with Envelope
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
-    const envelopeVariables = await api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id });
-    const envFrom = translateFromEnvelopeToMongo(envelopeVariables);
-    if (Object.keys(envFrom).length === 0) {
-        log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
-        return false;
-    }
-    const envTo = siteTo.build_settings.env || {};
-    // Merge from site A to site B
-    const mergedEnv = {
-        ...envTo,
-        ...envFrom,
-    };
-    // Apply environment variable updates
-    await api.updateSite({
-        siteId: siteTo.id,
-        body: {
-            build_settings: {
-                env: mergedEnv,
-            },
-        },
-    });
-    return true;
-};
 /**
  * Copies the env from a site configured with Envelope to a different site configured with Envelope
  * @returns {Promise<boolean>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
+const cloneEnvVars = async ({ api, siteFrom, siteTo }) => {
     const [envelopeFrom, envelopeTo] = await Promise.all([
         api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id }),
         api.getEnvVars({ accountId: siteTo.account_slug, siteId: siteTo.id }),
@@ -72,64 +42,6 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
     }
     return true;
 };
-/**
- * Copies the env from a site not configured with Envelope to a different site not configured with Envelope
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
-    const [{ build_settings: { env: envFrom = {} }, }, { build_settings: { env: envTo = {} }, },] = [siteFrom, siteTo];
-    if (Object.keys(envFrom).length === 0) {
-        log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
-        return false;
-    }
-    // Merge from site A to site B
-    const mergedEnv = {
-        ...envTo,
-        ...envFrom,
-    };
-    // Apply environment variable updates
-    await api.updateSite({
-        siteId: siteTo.id,
-        body: {
-            build_settings: {
-                env: mergedEnv,
-            },
-        },
-    });
-    return true;
-};
-/**
- * Copies the env from a site not configured with Envelope to a site configured with Envelope
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
-    const envFrom = siteFrom.build_settings.env || {};
-    const keysFrom = Object.keys(envFrom);
-    if (Object.keys(envFrom).length === 0) {
-        log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
-        return false;
-    }
-    const accountId = siteTo.account_slug;
-    const siteId = siteTo.id;
-    const envelopeTo = await api.getEnvVars({ accountId, siteId });
-    // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
-    const envVarsToDelete = envelopeTo.filter(({ key }) => keysFrom.includes(key));
-    // delete marked env vars in parallel
-    // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
-    await Promise.all(envVarsToDelete.map(({ key }) => api.deleteEnvVar({ accountId, siteId, key })));
-    // hit create endpoint
-    const body = translateFromMongoToEnvelope(envFrom);
-    try {
-        await api.createEnvVars({ accountId, siteId, body });
-    }
-    catch (error) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        throw error.json ? error.json.msg : error;
-    }
-    return true;
-};
 export const envClone = async (options, command) => {
     const { api, site } = command.netlify;
     if (!site.id && !options.from) {
@@ -152,21 +64,7 @@ export const envClone = async (options, command) => {
         logError(`Can't find site with id ${chalk.bold(siteId.to)}. Please make sure the site exists.`);
         return false;
     }
-    // determine if siteFrom and/or siteTo is on Envelope
-    let method;
-    if (!siteFrom.use_envelope && !siteTo.use_envelope) {
-        method = mongoToMongo;
-    }
-    else if (!siteFrom.use_envelope && siteTo.use_envelope) {
-        method = mongoToEnvelope;
-    }
-    else if (siteFrom.use_envelope && !siteTo.use_envelope) {
-        method = envelopeToMongo;
-    }
-    else {
-        method = envelopeToEnvelope;
-    }
-    const success = await method({ api, siteFrom, siteTo });
+    const success = await cloneEnvVars({ api, siteFrom, siteTo });
     if (!success) {
         return false;
     }

package/dist/commands/env/env-get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-get.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,eAAO,MAAM,MAAM,SAAgB,MAAM,WAAW,YAAY,WAAW,WAAW,+BAyCrF,CAAA"}
+{"version":3,"file":"env-get.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,eAAO,MAAM,MAAM,SAAgB,MAAM,WAAW,YAAY,WAAW,WAAW,+BA+BrF,CAAA"}

package/dist/commands/env/env-get.js

@@ -1,4 +1,4 @@
-import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
+import { chalk, log, logJson } from '../../utils/command-helpers.js';
 import { AVAILABLE_CONTEXTS, getEnvelopeEnv } from '../../utils/env/index.js';
 export const envGet = async (name, options, command) => {
     const { context, scope } = options;
@@ -9,14 +9,8 @@ export const envGet = async (name, options, command) => {
         return false;
     }
     const { siteInfo } = cachedConfig;
-    let { env } = cachedConfig;
-    if (siteInfo.use_envelope) {
-        env = await getEnvelopeEnv({ api, context, env, key: name, scope, siteInfo });
-    }
-    else if (context !== 'dev' || scope !== 'any') {
-        error(`To specify a context or scope, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
-        return false;
-    }
+    const env = await getEnvelopeEnv({ api, context, env: cachedConfig.env, key: name, scope, siteInfo });
+    // @ts-expect-error TS(7053) - Element implicitly has an 'any' type
     const { value } = env[name] || {};
     // Return json response for piping commands
     if (options.json) {

package/dist/commands/env/env-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-import.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-import.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAqE5C,eAAO,MAAM,SAAS,aAAoB,MAAM,WAAW,YAAY,WAAW,WAAW,+BA0C5F,CAAA"}
+{"version":3,"file":"env-import.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-import.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA2C5C,eAAO,MAAM,SAAS,aAAoB,MAAM,WAAW,YAAY,WAAW,WAAW,+BAyC5F,CAAA"}

package/dist/commands/env/env-import.js

@@ -3,34 +3,12 @@ import AsciiTable from 'ascii-table';
 import dotenv from 'dotenv';
 import { exit, log, logJson } from '../../utils/command-helpers.js';
 import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.js';
-/**
- * Updates the imported env in the site record
- * @returns {Promise<object>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const importIntoMongo = async ({ api, importedEnv, options, siteInfo }) => {
-    const { env = {} } = siteInfo.build_settings;
-    const siteId = siteInfo.id;
-    const finalEnv = options.replaceExisting ? importedEnv : { ...env, ...importedEnv };
-    // Apply environment variable updates
-    await api.updateSite({
-        siteId,
-        body: {
-            build_settings: {
-                // Only set imported variables if --replaceExisting or otherwise merge
-                // imported ones with the current environment variables.
-                env: finalEnv,
-            },
-        },
-    });
-    return finalEnv;
-};
 /**
  * Saves the imported env in the Envelope service
  * @returns {Promise<object>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const importIntoEnvelope = async ({ api, importedEnv, options, siteInfo }) => {
+const importDotEnv = async ({ api, importedEnv, options, siteInfo }) => {
     // fetch env vars
     const accountId = siteInfo.account_slug;
     const siteId = siteInfo.id;
@@ -84,8 +62,7 @@ export const envImport = async (fileName, options, command) => {
         return false;
     }
     const { siteInfo } = cachedConfig;
-    const importIntoService = siteInfo.use_envelope ? importIntoEnvelope : importIntoMongo;
-    const finalEnv = await importIntoService({ api, importedEnv, options, siteInfo });
+    const finalEnv = await importDotEnv({ api, importedEnv, options, siteInfo });
     // Return new environment variables of site if using json flag
     if (options.json) {
         logJson(finalEnv);

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

@@ -1 +1 @@
-{"version":3,"file":"env-list.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-list.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAMxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAiC5C,eAAO,MAAM,OAAO,YAAmB,YAAY,WAAW,WAAW,+BAmFxE,CAAA"}
+{"version":3,"file":"env-list.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-list.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAMxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAiC5C,eAAO,MAAM,OAAO,YAAmB,YAAY,WAAW,WAAW,+BA0ExE,CAAA"}

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

@@ -3,7 +3,7 @@ import AsciiTable from 'ascii-table';
 import { isCI } from 'ci-info';
 import inquirer from 'inquirer';
 import logUpdate from 'log-update';
-import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
+import { chalk, log, logJson } from '../../utils/command-helpers.js';
 import { AVAILABLE_CONTEXTS, getEnvelopeEnv, getHumanReadableScopes } from '../../utils/env/index.js';
 const MASK_LENGTH = 50;
 const MASK = '*'.repeat(MASK_LENGTH);
@@ -30,25 +30,22 @@ export const envList = async (options, command) => {
         return false;
     }
     const { env, siteInfo } = cachedConfig;
-    const isUsingEnvelope = siteInfo.use_envelope;
-    let environment = env;
-    if (isUsingEnvelope) {
-        environment = await getEnvelopeEnv({ api, context, env, scope, siteInfo });
-    }
-    else if (context !== 'dev' || scope !== 'any') {
-        error(`To specify a context or scope, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
-        return false;
-    }
+    let environment = await getEnvelopeEnv({ api, context, env, scope, siteInfo });
     // filter out general sources
-    environment = Object.fromEntries(Object.entries(environment).filter(([, variable]) => variable.sources[0] !== 'general' && variable.sources[0] !== 'internal'));
+    environment = Object.fromEntries(Object.entries(environment).filter(
+    // @ts-expect-error TS(18046) - 'variable' is of type 'unknown'
+    ([, variable]) => variable.sources[0] !== 'general' && variable.sources[0] !== 'internal'));
     // Return json response for piping commands
     if (options.json) {
-        const envDictionary = Object.fromEntries(Object.entries(environment).map(([key, variable]) => [key, variable.value]));
+        const envDictionary = Object.fromEntries(
+        // @ts-expect-error TS(18046) - 'variable' is of type 'unknown'
+        Object.entries(environment).map(([key, variable]) => [key, variable.value]));
         logJson(envDictionary);
         return false;
     }
     if (options.plain) {
         const plaintext = Object.entries(environment)
+            // @ts-expect-error TS(18046) - 'variable' is of type 'unknown'
             .map(([key, variable]) => `${key}=${variable.value}`)
             .join('\n');
         log(plaintext);
@@ -56,8 +53,8 @@ export const envList = async (options, command) => {
     }
     const forSite = `for site ${chalk.green(siteInfo.name)}`;
     const contextType = AVAILABLE_CONTEXTS.includes(context) ? 'context' : 'branch';
-    const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} ${contextType}` : '';
-    const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellow(options.scope)} scope` : '';
+    const withContext = `in the ${chalk.magenta(options.context)} ${contextType}`;
+    const withScope = scope === 'any' ? '' : `and ${chalk.yellow(options.scope)} scope`;
     if (Object.keys(environment).length === 0) {
         log(`No environment variables set ${forSite} ${withContext} ${withScope}`);
         return false;
@@ -66,10 +63,10 @@ export const envList = async (options, command) => {
     const count = Object.keys(environment).length;
     log(`${count} environment variable${count === 1 ? '' : 's'} ${forSite} ${withContext} ${withScope}`);
     if (isCI) {
-        log(getTable({ environment, hideValues: false, scopesColumn: isUsingEnvelope }));
+        log(getTable({ environment, hideValues: false, scopesColumn: true }));
         return false;
     }
-    logUpdate(getTable({ environment, hideValues: true, scopesColumn: isUsingEnvelope }));
+    logUpdate(getTable({ environment, hideValues: true, scopesColumn: true }));
     const { showValues } = await inquirer.prompt([
         {
             type: 'confirm',
@@ -81,7 +78,7 @@ export const envList = async (options, command) => {
     if (showValues) {
         // since inquirer adds a prompt, we need to account for it when printing the table again
         log(ansiEscapes.eraseLines(3));
-        logUpdate(getTable({ environment, hideValues: false, scopesColumn: isUsingEnvelope }));
+        logUpdate(getTable({ environment, hideValues: false, scopesColumn: true }));
         log(`${chalk.cyan('?')} Show values? ${chalk.cyan('Yes')}`);
     }
 };

package/dist/commands/env/env-set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-set.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAgI5C,eAAO,MAAM,MAAM,QAAe,MAAM,SAAS,MAAM,WAAW,YAAY,WAAW,WAAW,+BA8CnG,CAAA"}
+{"version":3,"file":"env-set.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAyG5C,eAAO,MAAM,MAAM,QAAe,MAAM,SAAS,MAAM,WAAW,YAAY,WAAW,WAAW,+BAkCnG,CAAA"}

package/dist/commands/env/env-set.js

@@ -1,27 +1,5 @@
 import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
 import { AVAILABLE_CONTEXTS, AVAILABLE_SCOPES, translateFromEnvelopeToMongo } from '../../utils/env/index.js';
-/**
- * Updates the env for a site record with a new key/value pair
- * @returns {Promise<object>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const setInMongo = async ({ api, key, siteInfo, value }) => {
-    const { env = {} } = siteInfo.build_settings;
-    const newEnv = {
-        ...env,
-        [key]: value,
-    };
-    // Apply environment variable updates
-    await api.updateSite({
-        siteId: siteInfo.id,
-        body: {
-            build_settings: {
-                env: newEnv,
-            },
-        },
-    });
-    return newEnv;
-};
 /**
  * Updates the env for a site configured with Envelope with a new key/value pair
  * @returns {Promise<object | boolean>}
@@ -122,18 +100,8 @@ export const envSet = async (key, value, options, command) => {
         return false;
     }
     const { siteInfo } = cachedConfig;
-    let finalEnv;
     // Get current environment variables set in the UI
-    if (siteInfo.use_envelope) {
-        finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope, secret });
-    }
-    else if (context || scope) {
-        error(`To specify a context or scope, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
-        return false;
-    }
-    else {
-        finalEnv = await setInMongo({ api, siteInfo, key, value });
-    }
+    const finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope, secret });
     if (!finalEnv) {
         return false;
     }

package/dist/commands/env/env-unset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-unset.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-unset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA0F5C,eAAO,MAAM,QAAQ,QAAe,MAAM,WAAW,YAAY,WAAW,WAAW,+BAkCtF,CAAA"}
+{"version":3,"file":"env-unset.d.ts","sourceRoot":"","sources":["../../../src/commands/env/env-unset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA6D5C,eAAO,MAAM,QAAQ,QAAe,MAAM,WAAW,YAAY,WAAW,WAAW,+BAsBtF,CAAA"}

package/dist/commands/env/env-unset.js

@@ -1,27 +1,5 @@
-import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
+import { chalk, log, logJson } from '../../utils/command-helpers.js';
 import { AVAILABLE_CONTEXTS, translateFromEnvelopeToMongo } from '../../utils/env/index.js';
-/**
- * Deletes a given key from the env of a site record
- * @returns {Promise<object>}
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const unsetInMongo = async ({ api, key, siteInfo }) => {
-    // Get current environment variables set in the UI
-    const { build_settings: { env = {} }, } = siteInfo;
-    const newEnv = env;
-    // Delete environment variable from current variables
-    delete newEnv[key];
-    // Apply environment variable updates
-    await api.updateSite({
-        siteId: siteInfo.id,
-        body: {
-            build_settings: {
-                env: newEnv,
-            },
-        },
-    });
-    return newEnv;
-};
 /**
  * Deletes a given key from the env of a site configured with Envelope
  * @returns {Promise<object>}
@@ -82,17 +60,7 @@ export const envUnset = async (key, options, command) => {
         return false;
     }
     const { siteInfo } = cachedConfig;
-    let finalEnv;
-    if (siteInfo.use_envelope) {
-        finalEnv = await unsetInEnvelope({ api, context, siteInfo, key });
-    }
-    else if (context) {
-        error(`To specify a context, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
-        return false;
-    }
-    else {
-        finalEnv = await unsetInMongo({ api, siteInfo, key });
-    }
+    const finalEnv = await unsetInEnvelope({ api, context, siteInfo, key });
     // Return new environment variables of site if using json flag
     if (options.json) {
         logJson(finalEnv);

package/dist/commands/functions/functions-create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functions-create.d.ts","sourceRoot":"","sources":["../../../src/commands/functions/functions-create.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAexC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA0tB5C,eAAO,MAAM,eAAe,SAAgB,MAAM,WAAW,YAAY,WAAW,WAAW,kBAQ9F,CAAA"}
+{"version":3,"file":"functions-create.d.ts","sourceRoot":"","sources":["../../../src/commands/functions/functions-create.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAcxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAutB5C,eAAO,MAAM,eAAe,SAAgB,MAAM,WAAW,YAAY,WAAW,WAAW,kBAQ9F,CAAA"}

package/dist/commands/functions/functions-create.js

@@ -5,9 +5,6 @@ import { createRequire } from 'module';
 import path, { dirname, join, relative } from 'path';
 import process from 'process';
 import { fileURLToPath, pathToFileURL } from 'url';
-import { promisify } from 'util';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'copy... Remove this comment to see the full error message
-import copyTemplateDirOriginal from 'copy-template-dir';
 import { findUp } from 'find-up';
 import fuzzy from 'fuzzy';
 import inquirer from 'inquirer';
@@ -16,10 +13,10 @@ import ora from 'ora';
 import { fileExistsAsync } from '../../lib/fs.js';
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.js';
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.js';
+import { copyTemplateDir } from '../../utils/copy-template-dir/copy-template-dir.js';
 import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.js';
 import execa from '../../utils/execa.js';
 import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.js';
-const copyTemplateDir = promisify(copyTemplateDirOriginal);
 const require = createRequire(import.meta.url);
 const templatesDir = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../../functions-templates');
 /**
@@ -313,7 +310,7 @@ const downloadFromURL = async function (command, options, argumentName, function
             const res = await fetch(downloadUrl);
             const finalName = path.basename(name, '.js') === functionName ? `${nameToUse}.js` : name;
             const dest = fs.createWriteStream(path.join(fnFolder, finalName));
-            res.body.pipe(dest);
+            res.body?.pipe(dest);
         }
         catch (error_) {
             throw new Error(`Error while retrieving ${downloadUrl} ${error_}`);
@@ -393,7 +390,6 @@ const installDeps = async ({ functionPackageJson, functionPath, functionsDir })
  * @param {'edge' | 'serverless'} funcType
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'command' implicitly has an 'any' type.
-// eslint-disable-next-line max-params
 const scaffoldFromTemplate = async function (command, options, argumentName, functionsDir, funcType) {
     // pull the rest of the metadata from the template
     const chosenTemplate = await pickTemplate(options, funcType);
@@ -437,7 +433,6 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
         // be removed before the command finishes.
         const omittedFromOutput = new Set(['.netlify-function-template.mjs', 'package.json', 'package-lock.json']);
         const createdFiles = await copyTemplateDir(pathToTemplate, functionPath, vars);
-        // @ts-expect-error TS(7006) FIXME: Parameter 'filePath' implicitly has an 'any' type.
         createdFiles.forEach((filePath) => {
             const filename = path.basename(filePath);
             if (!omittedFromOutput.has(filename)) {
@@ -460,7 +455,7 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
             spinner.succeed(`Installed dependencies for ${name}`);
         }
         if (funcType === 'edge') {
-            registerEFInToml(name, command.netlify);
+            await registerEFInToml(name, command.netlify);
         }
         await installAddons(command, addons, path.resolve(functionPath));
         await handleOnComplete({ command, onComplete });

package/dist/commands/integration/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/integration/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAUxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAS5C,wBAAgB,cAAc,CAAC,WAAW,KAAA,EAAE,YAAY,KAAA,OAOvD;AA0FD,wBAAsB,mBAAmB,CAAC,UAAU,KAAA,EAAE,MAAM,KAAA,EAAE,SAAS,KAAA,EAAE,sBAAsB,KAAA,EAAE,KAAK,KAAA,iBAuErG;AAED,wBAAsB,iBAAiB,CAErC,UAAU,KAAA,EAEV,OAAO,KAAA,EAEP,MAAM,KAAA,EAEN,SAAS,KAAA,EAET,sBAAsB,KAAA,EAEtB,KAAK,KAAA,EAEL,qBAAqB,KAAA,iBA4HtB;AA4BD,eAAO,MAAM,gBAAgB,0BA6B5B,CAAA;AAED,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAkEvE,CAAA"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/integration/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAUxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAS5C,wBAAgB,cAAc,CAAC,WAAW,KAAA,EAAE,YAAY,KAAA,OAOvD;AA0FD,wBAAsB,mBAAmB,CAAC,UAAU,KAAA,EAAE,MAAM,KAAA,EAAE,SAAS,KAAA,EAAE,sBAAsB,KAAA,EAAE,KAAK,KAAA,iBA0ErG;AAED,wBAAsB,iBAAiB,CAErC,UAAU,KAAA,EAEV,OAAO,KAAA,EAEP,MAAM,KAAA,EAEN,SAAS,KAAA,EAET,sBAAsB,KAAA,EAEtB,KAAK,KAAA,EAEL,qBAAqB,KAAA,iBA4HtB;AA4BD,eAAO,MAAM,gBAAgB,0BA6B5B,CAAA;AAED,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAkEvE,CAAA"}