netlify-cli 18.1.0 → 19.0.1-rc.0

package/dist/utils/command-helpers.d.ts

@@ -48,8 +48,8 @@ export declare const pollForToken: ({ api, ticket, }: {
  * @param {string} [tokenFromOptions] optional token from the provided --auth options
  * @returns {Promise<[null|string, 'flag' | 'env' |'config' |'not found']>}
  */
-export type tokenTuple = [string | null, TokenLocation];
-export declare const getToken: (tokenFromOptions?: string) => Promise<tokenTuple>;
+export type TokenTuple = [string | null, TokenLocation];
+export declare const getToken: (tokenFromOptions?: string) => Promise<TokenTuple>;
 /**
  * logs a json message
  */

package/dist/utils/command-helpers.js

@@ -45,7 +45,7 @@ const { name, version: packageVersion } = await getPackageJson();
 export const version = packageVersion;
 export const USER_AGENT = `${name}/${version} ${platform}-${arch} node-${process.version}`;
 /** A list of base command flags that needs to be sorted down on documentation and on help pages */
-const BASE_FLAGS = new Set(['--debug', '--httpProxy', '--httpProxyCertificateFilename']);
+const BASE_FLAGS = new Set(['--debug', '--http-proxy', '--http-proxy-certificate-filename']);
 export const NETLIFY_CYAN = chalk.rgb(40, 180, 170);
 export const NETLIFYDEV = `${chalk.greenBright('◈')} ${NETLIFY_CYAN('Netlify Dev')} ${chalk.greenBright('◈')}`;
 export const NETLIFYDEVLOG = `${chalk.greenBright('◈')}`;

package/dist/utils/deploy/hash-files.js

@@ -1,9 +1,9 @@
 import { promisify } from 'util';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'fold... Remove this comment to see the full error message
 import walker from 'folder-walker';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pump... Remove this comment to see the full error message
 import pumpModule from 'pump';
 import { fileFilterCtor, fileNormalizerCtor, hasherCtor, manifestCollectorCtor } from './hasher-segments.js';
+// Explicitly passing type parameter because inference isn't playing nicely with incompatible patterns for typing
+// function spread parameters + function overloading
 const pump = promisify(pumpModule);
 const hashFiles = async ({ assetType = 'file', 
 // @ts-expect-error TS(7031) FIXME: Binding element 'concurrentHash' implicitly has an... Remove this comment to see the full error message
@@ -28,7 +28,7 @@ statusCb, }) => {
     // hash: [fileObj, fileObj, fileObj]
     const filesShaMap = {};
     const manifestCollector = manifestCollectorCtor(files, filesShaMap, { statusCb, assetType });
-    await pump(fileStream, fileFilter, hasher, fileNormalizer, manifestCollector);
+    await pump([fileStream, fileFilter, hasher, fileNormalizer, manifestCollector]);
     return { files, filesShaMap };
 };
 export default hashFiles;

package/dist/utils/deploy/hash-fns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAUA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAoGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,UACb;IACN,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC,QAAQ,CAuGlB,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AASA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAsGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,UACb;IACN,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC,QAAQ,CAuGlB,CAAA;AAED,eAAe,OAAO,CAAA"}

package/dist/utils/deploy/hash-fns.js

@@ -4,10 +4,11 @@ import { promisify } from 'util';
 import { zipFunctions } from '@netlify/zip-it-and-ship-it';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'from... Remove this comment to see the full error message
 import fromArray from 'from2-array';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pump... Remove this comment to see the full error message
 import pumpModule from 'pump';
 import { INTERNAL_FUNCTIONS_FOLDER } from '../functions/functions.js';
 import { hasherCtor, manifestCollectorCtor } from './hasher-segments.js';
+// Explicitly passing type parameter because inference isn't playing nicely with incompatible patterns for typing
+// function spread parameters + function overloading
 const pump = promisify(pumpModule);
 // Maximum age of functions manifest (2 minutes).
 const MANIFEST_FILE_TTL = 12e4;
@@ -139,7 +140,7 @@ const hashFns = async (command, directories, config) => {
     // hash: [fileObj, fileObj, fileObj]
     const fnShaMap = {};
     const manifestCollector = manifestCollectorCtor(functions, fnShaMap, { statusCb, assetType });
-    await pump(functionStream, hasher, manifestCollector);
+    await pump([functionStream, hasher, manifestCollector]);
     return { functionSchedules, functions, functionsWithNativeModules, fnShaMap, fnConfig };
 };
 export default hashFns;

package/dist/utils/deploy/hasher-segments.d.ts

@@ -1,14 +1,14 @@
 export declare const hasherCtor: ({ concurrentHash, hashAlgorithm }: {
     concurrentHash: any;
     hashAlgorithm: any;
-}) => any;
+}) => import("stream").Transform;
 export declare const fileNormalizerCtor: ({ assetType, normalizer: normalizeFunction }: {
     assetType: any;
     normalizer: any;
-}) => any;
+}) => import("through2").Through2Constructor;
 export declare const manifestCollectorCtor: (filesObj: any, shaMap: any, { assetType, statusCb }: {
     assetType: any;
     statusCb: any;
-}) => any;
+}) => import("stream").Writable;
 export declare const fileFilterCtor: any;
 //# sourceMappingURL=hasher-segments.d.ts.map

package/dist/utils/deploy/hasher-segments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hasher-segments.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hasher-segments.ts"],"names":[],"mappings":"AA0BA,eAAO,MAAM,UAAU;;;SAYtB,CAAA;AAID,eAAO,MAAM,kBAAkB;;;SAU3B,CAAA;AAIJ,eAAO,MAAM,qBAAqB;;;SAqBjC,CAAA;AAKD,eAAO,MAAM,cAAc,KAAsD,CAAA"}
+{"version":3,"file":"hasher-segments.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hasher-segments.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,UAAU;;;gCAWtB,CAAA;AAID,eAAO,MAAM,kBAAkB;;;4CAS3B,CAAA;AAIJ,eAAO,MAAM,qBAAqB;;;+BAoBjC,CAAA;AAKD,eAAO,MAAM,cAAc,KAAsD,CAAA"}

package/dist/utils/deploy/hasher-segments.js

@@ -1,13 +1,10 @@
 import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
 import { pipeline } from 'node:stream/promises';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'flus... Remove this comment to see the full error message
 import flushWriteStream from 'flush-write-stream';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'para... Remove this comment to see the full error message
 import transform from 'parallel-transform';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'thro... Remove this comment to see the full error message
 import { objCtor as objFilterCtor } from 'through2-filter';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'thro... Remove this comment to see the full error message
 import { obj as map } from 'through2-map';
 import { normalizePath } from './util.js';
 const hashFile = async (filePath, algorithm) => {
@@ -22,7 +19,6 @@ const hashFile = async (filePath, algorithm) => {
 export const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
     if (!concurrentHash)
         throw new Error('Missing required opts');
-    // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
     return transform(concurrentHash, { objectMode: true }, async (fileObj, cb) => {
         try {
             const hash = await hashFile(fileObj.filepath, hashAlgorithm);
@@ -36,9 +32,7 @@ export const hasherCtor = ({ concurrentHash, hashAlgorithm }) => {
 };
 // Inject normalized file names into normalizedPath and assetType
 // @ts-expect-error TS(7031) FIXME: Binding element 'assetType' implicitly has an 'any... Remove this comment to see the full error message
-export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) => 
-// @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
-map((fileObj) => {
+export const fileNormalizerCtor = ({ assetType, normalizer: normalizeFunction }) => map((fileObj) => {
     const normalizedFile = { ...fileObj, assetType, normalizedPath: normalizePath(fileObj.relname) };
     if (normalizeFunction !== undefined) {
         return normalizeFunction(normalizedFile);
@@ -50,7 +44,6 @@ map((fileObj) => {
 export const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb }) => {
     if (!statusCb || !assetType)
         throw new Error('Missing required options');
-    // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
     return flushWriteStream.obj((fileObj, _, cb) => {
         filesObj[fileObj.normalizedPath] = fileObj.hash;
         // We map a hash to multiple fileObj's because the same file
@@ -66,7 +59,7 @@ export const manifestCollectorCtor = (filesObj, shaMap, { assetType, statusCb })
             msg: `Hashing ${fileObj.relname}`,
             phase: 'progress',
         });
-        cb(null);
+        cb();
     });
 };
 /* eslint-enable promise/prefer-await-to-callbacks */

package/dist/utils/framework-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAK3C,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,uBAG9B;IACD,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,cAAc,CAAA;CACzB,KAAG,OAAO,CAAC,iBAAiB,CAmD5B,CAAA"}
+{"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAK3C,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,uBAG9B;IACD,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,cAAc,CAAA;CACzB,KAAG,OAAO,CAAC,iBAAiB,CAmD5B,CAAA"}

package/dist/utils/framework-server.js

@@ -1,3 +1,4 @@
+import dns from 'node:dns/promises';
 import { rm } from 'node:fs/promises';
 import waitPort from 'wait-port';
 import { startSpinner, stopSpinner } from '../lib/spinner.js';
@@ -28,8 +29,8 @@ export const startFrameworkServer = async function ({ cwd, settings, }) {
     let port;
     try {
         if (settings.skipWaitPort) {
-            // default ip version based on node version
-            const ipVersion = parseInt(process.versions.node.split('.')[0]) >= 18 ? 6 : 4;
+            const ipInfo = await dns.lookup('localhost');
+            const ipVersion = ipInfo?.family || 4;
             port = { open: true, ipVersion };
         }
         else {

package/dist/utils/get-global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-global-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-global-config.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,QAAA,MAAM,eAAe,oBAkBpB,CAAA;AAED,eAAO,MAAM,gBAAgB,YAE5B,CAAA;AAED,eAAe,eAAe,CAAA"}
+{"version":3,"file":"get-global-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-global-config.ts"],"names":[],"mappings":"AAkBA;;GAEG;AACH,QAAA,MAAM,eAAe,oBAmBpB,CAAA;AAED,eAAO,MAAM,gBAAgB,YAE5B,CAAA;AAED,eAAe,eAAe,CAAA"}

package/dist/utils/get-global-config.js

@@ -1,5 +1,4 @@
 import { readFile } from 'fs/promises';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'conf... Remove this comment to see the full error message
 import Configstore from 'configstore';
 import { v4 as uuidv4 } from 'uuid';
 import { getLegacyPathInHome, getPathInHome } from '../lib/settings.js';
@@ -30,7 +29,8 @@ const getGlobalConfig = async function () {
         catch { }
         // Use legacy config as default values
         const defaults = { ...globalConfigDefaults, ...legacyConfig };
-        configStore = new Configstore(null, defaults, { configPath });
+        // The id param is only used when not passing `configPath` but the type def requires it
+        configStore = new Configstore('unused-id', defaults, { configPath });
     }
     return configStore;
 };

package/dist/utils/get-repo-data.d.ts

@@ -9,12 +9,12 @@ declare const getRepoData: ({ remoteName, workingDir }: {
     remoteName?: string;
     workingDir: string;
 }) => Promise<{
-    name: any;
-    owner: any;
-    repo: any;
+    name: string | null;
+    owner: string | null;
+    repo: string | null;
     url: any;
     branch: string;
-    provider: any;
+    provider: string | null;
     httpsUrl: string;
     error?: undefined;
 } | {

package/dist/utils/get-repo-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-repo-data.d.ts","sourceRoot":"","sources":["../../src/utils/get-repo-data.ts"],"names":[],"mappings":"AAYA;;;;;;GAMG;AAEH,QAAA,MAAM,WAAW,+BAA+C;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;EAmD1G,CAAA;AAOD,eAAe,WAAW,CAAA"}
+{"version":3,"file":"get-repo-data.d.ts","sourceRoot":"","sources":["../../src/utils/get-repo-data.ts"],"names":[],"mappings":"AAUA;;;;;;GAMG;AAEH,QAAA,MAAM,WAAW,+BAA+C;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;EAsD1G,CAAA;AAOD,eAAe,WAAW,CAAA"}

package/dist/utils/get-repo-data.js

@@ -2,10 +2,8 @@ import { dirname } from 'path';
 import util from 'util';
 import { findUp } from 'find-up';
 import gitRepoInfo from 'git-repo-info';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'gitc... Remove this comment to see the full error message
 import gitconfiglocal from 'gitconfiglocal';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pars... Remove this comment to see the full error message
-import parseGitRemote from 'parse-github-url';
+import parseGithubUrl from 'parse-github-url';
 import { log } from './command-helpers.js';
 /**
  *
@@ -37,7 +35,11 @@ const getRepoData = async function ({ remoteName, workingDir }) {
             throw new Error(`The specified remote "${remoteName}" is not defined in Git repo. Please use --git-remote-name flag to specify a remote.`);
         }
         const { url } = gitConfig.remote[remoteName];
-        const { host, name, owner, repo } = parseGitRemote(url);
+        const parsedUrl = parseGithubUrl(url);
+        if (parsedUrl == null) {
+            throw new Error(`The specified Git remote ${remoteName} is not a valid URL: ${url}`);
+        }
+        const { host, name, owner, repo } = parsedUrl;
         const { branch } = gitRepoInfo();
         return {
             name,
@@ -45,8 +47,7 @@ const getRepoData = async function ({ remoteName, workingDir }) {
             repo,
             url,
             branch,
-            // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-            provider: PROVIDERS[host] || host,
+            provider: host != null ? PROVIDERS[host] ?? host : host,
             httpsUrl: `https://${host}/${repo}`,
         };
     }

package/dist/utils/open-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../../src/utils/open-browser.ts"],"names":[],"mappings":"AAqBA,KAAK,eAAe,GAAG;IACrB,sBAAsB,EAAE,OAAO,CAAA;IAC/B,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,QAAA,MAAM,WAAW,oCAAoD,eAAe,kBAmBnF,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../../src/utils/open-browser.ts"],"names":[],"mappings":"AAoBA,KAAK,eAAe,GAAG;IACrB,sBAAsB,EAAE,OAAO,CAAA;IAC/B,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,QAAA,MAAM,WAAW,oCAAoD,eAAe,kBAmBnF,CAAA;AAED,eAAe,WAAW,CAAA"}

package/dist/utils/open-browser.js

@@ -1,6 +1,5 @@
 import process from 'process';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'bett... Remove this comment to see the full error message
-import open from 'better-opn';
+import open from 'open';
 import isDockerContainer from 'is-docker';
 import { chalk, log } from './command-helpers.js';
 const unableToOpenBrowserMessage = function ({ message, url }) {

package/dist/utils/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAkB/D,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAqyB9D,eAAO,MAAM,WAAW,aAAuB,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU,oQAsBpB;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,oBA4G9G,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAkB/D,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAqyB9D,eAAO,MAAM,WAAW,aAAuB,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU,oQAsBpB;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,oBA4G9G,CAAA"}

package/dist/utils/proxy.js

@@ -9,12 +9,9 @@ import path from 'path';
 import process from 'process';
 import util from 'util';
 import zlib from 'zlib';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'cont... Remove this comment to see the full error message
 import contentType from 'content-type';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'cook... Remove this comment to see the full error message
 import cookie from 'cookie';
 import { getProperty } from 'dot-prop';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'etag... Remove this comment to see the full error message
 import generateETag from 'etag';
 import getAvailablePort from 'get-port';
 import httpProxy from 'http-proxy';

package/dist/utils/rules-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules-proxy.d.ts","sourceRoot":"","sources":["../../src/utils/rules-proxy.ts"],"names":[],"mappings":"AAaA,OAAO,EAAW,QAAQ,EAAE,MAAM,YAAY,CAAA;AAM9C,eAAO,MAAM,SAAS,qCAQrB,CAAA;AAED,eAAO,MAAM,WAAW,aAGvB,CAAA;AAGD,eAAO,MAAM,WAAW,uBAKvB,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;MAevB,OAAO,CAAC,QAAQ,CAoEnB,CAAA"}
+{"version":3,"file":"rules-proxy.d.ts","sourceRoot":"","sources":["../../src/utils/rules-proxy.ts"],"names":[],"mappings":"AAYA,OAAO,EAAW,QAAQ,EAAE,MAAM,YAAY,CAAA;AAM9C,eAAO,MAAM,SAAS,qCAQrB,CAAA;AAED,eAAO,MAAM,WAAW,aAGvB,CAAA;AAGD,eAAO,MAAM,WAAW,uBAKvB,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;MAevB,OAAO,CAAC,QAAQ,CAoEnB,CAAA"}

package/dist/utils/rules-proxy.js

@@ -1,6 +1,5 @@
 import path from 'path';
 import chokidar from 'chokidar';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'cook... Remove this comment to see the full error message
 import cookie from 'cookie';
 import redirector from 'netlify-redirector';
 import pFilter from 'p-filter';

package/dist/utils/run-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-build.d.ts","sourceRoot":"","sources":["../../src/utils/run-build.ts"],"names":[],"mappings":"AAGA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAS/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAqC3C,eAAO,MAAM,eAAe,mDAMzB;IACD,OAAO,EAAE,WAAW,CAAA;IAEpB,OAAO,EAAE,QAAQ,CAAA;IACjB,QAAQ,EAAE,cAAc,CAAA;IACxB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAA;CAC1B;;;;;;;;;EAqGA,CAAA;AAED,KAAK,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;AAEjF,eAAO,MAAM,cAAc,YAAa,kBAAkB;;;;;;;;;EAAqD,CAAA;AAE/G,eAAO,MAAM,gBAAgB,YAAa,kBAAkB;;;;;;;;;EAAuD,CAAA"}
+{"version":3,"file":"run-build.d.ts","sourceRoot":"","sources":["../../src/utils/run-build.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAS/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAqC3C,eAAO,MAAM,eAAe,mDAMzB;IACD,OAAO,EAAE,WAAW,CAAA;IAEpB,OAAO,EAAE,QAAQ,CAAA;IACjB,QAAQ,EAAE,cAAc,CAAA;IACxB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IACtB,QAAQ,EAAE,OAAO,GAAG,KAAK,CAAA;CAC1B;;;;;;;;;EA6GA,CAAA;AAED,KAAK,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;AAEjF,eAAO,MAAM,cAAc,YAAa,kBAAkB;;;;;;;;;EAAqD,CAAA;AAE/G,eAAO,MAAM,gBAAgB,YAAa,kBAAkB;;;;;;;;;EAAuD,CAAA"}

package/dist/utils/run-build.js

@@ -58,7 +58,7 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
         saveConfig: options.saveConfig,
         edgeFunctionsBootstrapURL: await getBootstrapURL(),
     };
-    const devCommand = async (settingsOverrides = {}) => {
+    const devCommand = async ({ netlifyConfig, settingsOverrides, } = {}) => {
         let cwd = command.workingDir;
         if (!options.cwd && command.project.workspace?.packages.length) {
             cwd = join(command.project.jsWorkspaceRoot, settings.baseDirectory || '');
@@ -68,6 +68,11 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
                 ...settings,
                 ...settingsOverrides,
                 ...(options.skipWaitPort ? { skipWaitPort: true } : {}),
+                env: {
+                    ...settings.env,
+                    ...settingsOverrides?.env,
+                    ...netlifyConfig?.build.environment,
+                },
             },
             cwd,
         });
@@ -102,7 +107,7 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
         if (!options.dir && netlifyConfig?.build?.publish) {
             settingsOverrides.dist = netlifyConfig.build.publish;
         }
-        await devCommand(settingsOverrides);
+        await devCommand({ netlifyConfig, settingsOverrides });
         return { configPath: tempConfigPath };
     }
     const startDevOptions = {

package/dist/utils/sites/create-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-template.d.ts","sourceRoot":"","sources":["../../../src/utils/sites/create-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAMxC,OAAO,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAA;AAIlD,eAAO,MAAM,cAAc,UAAiB,MAAM,KAAG,OAAO,CAAC,QAAQ,EAAE,CAatE,CAAA;AAED,eAAO,MAAM,eAAe,sCAIzB;IACD,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;CACnB,iBA4BA,CAAA;AAED,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,OAAO,CAAC,OAAO,CAMtE,CAAA;AAED,eAAO,MAAM,aAAa,8BAA+B;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,QACnD,CAAA"}
+{"version":3,"file":"create-template.d.ts","sourceRoot":"","sources":["../../../src/utils/sites/create-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAKxC,OAAO,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAA;AAIlD,eAAO,MAAM,cAAc,UAAiB,MAAM,KAAG,OAAO,CAAC,QAAQ,EAAE,CAatE,CAAA;AAED,eAAO,MAAM,eAAe,sCAIzB;IACD,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,YAAY,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;CACnB,iBA4BA,CAAA;AAED,eAAO,MAAM,kBAAkB,SAAgB,MAAM,KAAG,OAAO,CAAC,OAAO,CAMtE,CAAA;AAED,eAAO,MAAM,aAAa,8BAA+B;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,QACnD,CAAA"}

package/dist/utils/sites/create-template.js

@@ -1,5 +1,4 @@
 import inquirer from 'inquirer';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pars... Remove this comment to see the full error message
 import parseGitHubUrl from 'parse-github-url';
 import { log } from '../command-helpers.js';
 import { getTemplatesFromGitHub } from './utils.js';
@@ -16,8 +15,8 @@ export const fetchTemplates = async (token) => {
 };
 export const getTemplateName = async ({ ghToken, options, repository, }) => {
     if (repository) {
-        const { repo } = parseGitHubUrl(repository);
-        return repo || `netlify-templates/${repository}`;
+        const parsedUrl = parseGitHubUrl(repository);
+        return parsedUrl?.repo || `netlify-templates/${repository}`;
     }
     if (options.url) {
         const urlFromOptions = new URL(options.url);

package/dist/utils/state-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-config.d.ts","sourceRoot":"","sources":["../../src/utils/state-config.ts"],"names":[],"mappings":"AA8BA,MAAM,CAAC,OAAO,OAAO,WAAW;gBAElB,GAAG,KAAA;IAKf,IAAI,GAAG,QA4BN;IAED,IAAI,GAAG,CAAC,GAAG,KAAA,EAiBV;IAED,IAAI,IAAI,WAEP;IAGD,GAAG,CAAC,GAAG,KAAA;IASP,GAAG,CAAC,GAAG,IAAI,OAAA;IAgBX,GAAG,CAAC,GAAG,KAAA;IAKP,MAAM,CAAC,GAAG,KAAA;IAMV,KAAK;CAGN"}
+{"version":3,"file":"state-config.d.ts","sourceRoot":"","sources":["../../src/utils/state-config.ts"],"names":[],"mappings":"AA6BA,MAAM,CAAC,OAAO,OAAO,WAAW;gBAElB,GAAG,KAAA;IAKf,IAAI,GAAG,QA4BN;IAED,IAAI,GAAG,CAAC,GAAG,KAAA,EAiBV;IAED,IAAI,IAAI,WAEP;IAGD,GAAG,CAAC,GAAG,KAAA;IASP,GAAG,CAAC,GAAG,IAAI,OAAA;IAgBX,GAAG,CAAC,GAAG,KAAA;IAKP,MAAM,CAAC,GAAG,KAAA;IAMV,KAAK;CAGN"}

package/dist/utils/state-config.js

@@ -3,7 +3,6 @@ import path from 'path';
 import process from 'process';
 import { deleteProperty, getProperty, hasProperty, setProperty } from 'dot-prop';
 import { findUpSync } from 'find-up';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'writ... Remove this comment to see the full error message
 import writeFileAtomic from 'write-file-atomic';
 import { getPathInProject } from '../lib/settings.js';
 const STATE_PATH = getPathInProject(['state.json']);

package/dist/utils/types.d.ts

@@ -190,5 +190,12 @@ export interface Template {
     sourceCodeUrl: string;
     slug: string;
 }
+type EnvironmentVariableScope = 'builds' | 'functions' | 'runtime' | 'post_processing';
+type EnvironmentVariableSource = 'account' | 'addons' | 'configFile' | 'general' | 'internal' | 'ui';
+export type EnvironmentVariables = Record<string, {
+    sources: EnvironmentVariableSource[];
+    value: string;
+    scopes?: EnvironmentVariableScope[];
+}>;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE1C,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;AAErE,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE;QACL,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;IACD,GAAG,EAAE;QACH,QAAQ,EAAE,MAAM,EAAE,CAAA;QAClB,IAAI,EAAE,MAAM,CAAA;QACZ,iBAAiB,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KACtC,CAAA;IACD,IAAI,EAAE,cAAc,CAAA;IACpB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,GAAG,EAAE,MAAM,CAAC,UAAU,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,+CAA+C;IAC/C,eAAe,CAAC,EAAE,OAAO,CAAA;IAEzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,8CAA8C;IAC9C,aAAa,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;IACnC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG;IAChD,uBAAuB;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,iDAAiD;IACjD,WAAW,EAAE,MAAM,CAAA;IACnB,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAA;IACZ,kDAAkD;IAClD,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAA;IAChF,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,MAAM,WAAW,OAAQ,SAAQ,eAAe;IAC9C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,KAAK,GAAG,IAAI,CAAA;AAErD,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE;QACd,gBAAgB,EAAE,MAAM,EAAE,CAAA;QAC1B,GAAG,EAAE,MAAM,CAAA;QACX,aAAa,EAAE,MAAM,CAAA;QACrB,GAAG,EAAE,MAAM,CAAA;QACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC7B,EAAE,EAAE,MAAM,CAAA;QACV,YAAY,EAAE,OAAO,CAAA;QACrB,QAAQ,EAAE,MAAM,CAAA;QAChB,WAAW,EAAE,OAAO,CAAA;QACpB,WAAW,EAAE,MAAM,CAAA;QACnB,SAAS,EAAE,MAAM,CAAA;QACjB,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,EAAE,OAAO,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,mBAAmB,EAAE;QACnB,GAAG,EAAE;YACH,MAAM,EAAE,OAAO,CAAA;YACf,MAAM,EAAE,OAAO,CAAA;SAChB,CAAA;QACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,EAAE;YACF,MAAM,EAAE,OAAO,CAAA;YACf,MAAM,EAAE,OAAO,CAAA;SAChB,CAAA;QACD,IAAI,EAAE,OAAO,CAAA;KACd,CAAA;IACD,gBAAgB,EAAE;QAChB,SAAS,EAAE,MAAM,CAAA;QACjB,MAAM,EAAE,MAAM,CAAA;QACd,QAAQ,EAAE,MAAM,CAAA;QAChB,UAAU,EAAE,MAAM,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;QAClB,OAAO,EAAE,MAAM,CAAA;QACf,UAAU,EAAE,MAAM,CAAA;QAClB,cAAc,EAAE,MAAM,CAAA;QACtB,UAAU,EAAE,MAAM,CAAA;QAClB,KAAK,EAAE,OAAO,CAAA;QACd,aAAa,EAAE,MAAM,CAAA;QACrB,EAAE,EAAE,MAAM,CAAA;QACV,MAAM,EAAE,OAAO,CAAA;QACf,IAAI,EAAE,MAAM,CAAA;QACZ,YAAY,EAAE,MAAM,CAAA;QACpB,QAAQ,EAAE,MAAM,EAAE,CAAA;QAClB,kBAAkB,EAAE,MAAM,EAAE,CAAA;QAC5B,SAAS,EAAE,MAAM,CAAA;QACjB,UAAU,EAAE,MAAM,CAAA;QAClB,cAAc,EAAE,MAAM,CAAA;QACtB,OAAO,EAAE,MAAM,CAAA;QACf,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;QACb,UAAU,EAAE,MAAM,CAAA;QAClB,GAAG,EAAE,MAAM,CAAA;QACX,OAAO,EAAE,MAAM,CAAA;KAChB,CAAA;IACD,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,OAAO,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnE,MAAM,MAAM,MAAM,GAAG;IACnB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAChE,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,MAAM,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CACb"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"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"}