netlify-cli 18.1.0 → 19.0.1-rc.0

package/dist/lib/build.js

@@ -6,43 +6,12 @@ import tomlify from 'tomlify-j0.4';
 import { getFeatureFlagsFromSiteInfo } from '../utils/feature-flags.js';
 import { getBootstrapURL } from './edge-functions/bootstrap.js';
 import { featureFlags as edgeFunctionsFeatureFlags } from './edge-functions/consts.js';
-/**
- * The buildConfig + a missing cachedConfig
- * @typedef BuildConfig
- * @type {Parameters<import('@netlify/build/src/core/main.js')>[0] & {cachedConfig: any}}
- */
 // We have already resolved the configuration using `@netlify/config`
 // This is stored as `netlify.cachedConfig` and can be passed to
 // `@netlify/build --cachedConfig`.
-/**
- *
- * @param {object} config
- * @param {*} config.cachedConfig
- * @param {string} [config.packagePath]
- * @param {string} config.currentDir
- * @param {string} config.token
- * @param {import('commander').OptionValues} config.options
- * @param {*} config.deployHandler
- * @returns {BuildConfig}
- */
-export const getBuildOptions = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'cachedConfig' implicitly has an '... Remove this comment to see the full error message
-cachedConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'currentDir' implicitly has an 'an... Remove this comment to see the full error message
-currentDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'defaultConfig' implicitly has an '... Remove this comment to see the full error message
-defaultConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'deployHandler' implicitly has an ... Remove this comment to see the full error message
-deployHandler, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'context' implicitly has an 'any' ... Remove this comment to see the full error message
-options: { context, cwd, debug, dry, json, offline, silent }, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'packagePath' implicitly has an 'a... Remove this comment to see the full error message
-packagePath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'token' implicitly has an 'any' ty... Remove this comment to see the full error message
-token, }) => {
+export const getBuildOptions = async ({ cachedConfig, currentDir, defaultConfig, deployHandler, options: { context, cwd, debug, dry, json, offline, silent }, packagePath, token, }) => {
     const eventHandlers = {
         onEnd: {
-            // @ts-expect-error TS(7031) FIXME: Binding element 'netlifyConfig' implicitly has an ... Remove this comment to see the full error message
             handler: ({ netlifyConfig }) => {
                 const string = tomlify.toToml(netlifyConfig);
                 if (!fs.existsSync(`${currentDir}/.netlify`)) {
@@ -55,7 +24,6 @@ token, }) => {
         },
     };
     if (deployHandler) {
-        // @ts-expect-error TS(2339) FIXME: Property 'onPostBuild' does not exist on type '{ o... Remove this comment to see the full error message
         eventHandlers.onPostBuild = {
             handler: deployHandler,
             description: 'Deploy Site',
@@ -63,11 +31,11 @@ token, }) => {
     }
     return {
         cachedConfig,
-        defaultConfig,
+        defaultConfig: defaultConfig ?? {},
         siteId: cachedConfig.siteInfo.id,
         accountId: cachedConfig.siteInfo.account_id,
         packagePath,
-        token,
+        token: token ?? undefined,
         dry,
         debug,
         context,
@@ -82,16 +50,11 @@ token, }) => {
             ...getFeatureFlagsFromSiteInfo(cachedConfig.siteInfo),
             functionsBundlingManifest: true,
         },
+        // @ts-expect-error(serhalp) -- TODO(serhalp) Upstream the type fixes above into @netlify/build
         eventHandlers,
         edgeFunctionsBootstrapURL: await getBootstrapURL(),
     };
 };
-/**
- * run the build command
- * @param {BuildConfig} options
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 export const runBuild = async (options) => {
     // If netlify NETLIFY_API_URL is set we need to pass this information to @netlify/build
     // TODO don't use testOpts, but add real properties to do this.
@@ -101,6 +64,8 @@ export const runBuild = async (options) => {
             scheme: apiUrl.protocol.slice(0, -1),
             host: apiUrl.host,
         };
+        // @ts-expect-error(serhalp) -- I don't know what's going on here and I can't convince myself it even works as
+        // intended. TODO(serhalp) Investigate and fix types.
         options = { ...options, testOpts };
     }
     const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(options);

package/dist/lib/completion/script.js

@@ -4,7 +4,6 @@
 // if this file is renamed or moved then it needs to be adapted there
 import { existsSync, readFileSync } from 'fs';
 import process from 'process';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'tabt... Remove this comment to see the full error message
 import { log, parseEnv } from 'tabtab';
 import { AUTOCOMPLETION_FILE } from './constants.js';
 import getAutocompletion from './get-autocompletion.js';

package/dist/lib/functions/form-submissions-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-submissions-handler.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/form-submissions-handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAU7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEtD,eAAO,MAAM,cAAc,uCAGxB;IACD,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,uBAmBA,CAAA;AAED,eAAO,MAAM,2BAA2B,oCAGrC;IACD,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,EAAE,MAAM,CAAA;CAChB,KAAG,cAwIH,CAAA"}
+{"version":3,"file":"form-submissions-handler.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/form-submissions-handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAS7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEtD,eAAO,MAAM,cAAc,uCAGxB;IACD,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,uBAmBA,CAAA;AAED,eAAO,MAAM,2BAA2B,oCAGrC;IACD,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,EAAE,MAAM,CAAA;CAChB,KAAG,cAwIH,CAAA"}

package/dist/lib/functions/form-submissions-handler.js

@@ -1,7 +1,5 @@
 import { Readable } from 'stream';
-// @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 { parse as parseContentType } from 'content-type';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'mult... Remove this comment to see the full error message
 import multiparty from 'multiparty';
 import getRawBody from 'raw-body';
 import { warn } from '../../utils/command-helpers.js';

package/dist/lib/functions/runtimes/js/builders/netlify-lambda.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"netlify-lambda.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/functions/runtimes/js/builders/netlify-lambda.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,mBAAmB;;;;;;;;EAqD/B,CAAA;AAED,wBAA8B,OAAO;;;;;;;;GASpC"}
+{"version":3,"file":"netlify-lambda.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/functions/runtimes/js/builders/netlify-lambda.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,mBAAmB;;;;;;;;EAuD/B,CAAA;AAED,wBAA8B,OAAO;;;;;;;;GASpC"}

package/dist/lib/functions/runtimes/js/builders/netlify-lambda.js

@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises';
 import { resolve } from 'path';
-import { program } from 'commander';
+import { Command } from 'commander';
 import execa from '../../../../../utils/execa.js';
 import { fileExistsAsync } from '../../../../fs.js';
 import { memoizedBuild } from '../../../memoized-build.js';
@@ -10,17 +10,18 @@ export const detectNetlifyLambda = async function ({ packageJson } = {}) {
     if (!((dependencies && dependencies['netlify-lambda']) || (devDependencies && devDependencies['netlify-lambda']))) {
         return false;
     }
+    const program = new Command()
+        .option('-s, --static')
+        .option('-c, --config [file]')
+        .option('-p, --port [number]')
+        .option('-b, --babelrc [file]')
+        .option('-t, --timeout [delay]');
+    program.allowExcessArguments();
     // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
     const matchingScripts = Object.entries(scripts).filter(([, script]) => script.match(/netlify-lambda\s+build/));
     for (const [key, script] of matchingScripts) {
         // E.g. ["netlify-lambda", "build", "functions/folder"]
         // these are all valid options for netlify-lambda
-        program
-            .option('-s, --static')
-            .option('-c, --config [file]')
-            .option('-p, --port [number]')
-            .option('-b, --babelrc [file]')
-            .option('-t, --timeout [delay]');
         program.parse(script.split(' ') ?? []);
         // We are not interested in 'netlify-lambda' and 'build' commands
         const functionDirectories = program.args.filter((arg) => !['netlify-lambda', 'build'].includes(arg));

package/dist/lib/functions/runtimes/js/builders/zisi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zisi.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/functions/runtimes/js/builders/zisi.ts"],"names":[],"mappings":"AAgHA;;;;;GAKG;AAEH,eAAO,MAAM,wBAAwB;;;;+EAMjC,CAAA;AAoCJ;;;;;;;;;GASG;AAEH,wBAA8B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE;;;;;;;CAAA;;;;;;;;;;;;;;;;GAoDlG"}
+{"version":3,"file":"zisi.d.ts","sourceRoot":"","sources":["../../../../../../src/lib/functions/runtimes/js/builders/zisi.ts"],"names":[],"mappings":"AA+GA;;;;;GAKG;AAEH,eAAO,MAAM,wBAAwB;;;;+EAMjC,CAAA;AAoCJ;;;;;;;;;GASG;AAEH,wBAA8B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE;;;;;;;CAAA;;;;;;;;;;;;;;;;GAoDlG"}

package/dist/lib/functions/runtimes/js/builders/zisi.js

@@ -4,7 +4,6 @@ import path from 'path';
 import { zipFunction, listFunction } from '@netlify/zip-it-and-ship-it';
 import decache from 'decache';
 import { readPackageUp } from 'read-package-up';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'sour... Remove this comment to see the full error message
 import sourceMapSupport from 'source-map-support';
 import { NETLIFYDEVERR } from '../../../../../utils/command-helpers.js';
 import { SERVE_FUNCTIONS_FOLDER } from '../../../../../utils/functions/functions.js';

package/dist/lib/functions/runtimes/js/worker.js

@@ -3,7 +3,6 @@ import process from 'process';
 import { isMainThread, workerData, parentPort } from 'worker_threads';
 import { isStream } from 'is-stream';
 import lambdaLocal from 'lambda-local';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'sour... Remove this comment to see the full error message
 import sourceMapSupport from 'source-map-support';
 if (isMainThread) {
     throw new Error(`Do not import "${import.meta.url}" in the main thread.`);

package/dist/recipes/vscode/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/recipes/vscode/settings.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAKrC,eAAO,MAAM,aAAa;;;;SAwBzB,CAAA;AAGD,eAAO,MAAM,WAAW;;;;;;EA0BvB,CAAA;AAGD,eAAO,MAAM,aAAa;;;mBAKzB,CAAA"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/recipes/vscode/settings.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAKrC,eAAO,MAAM,aAAa;;;;SA0BzB,CAAA;AAGD,eAAO,MAAM,WAAW;;;;;;EA0BvB,CAAA;AAGD,eAAO,MAAM,aAAa;;;mBAKzB,CAAA"}

package/dist/recipes/vscode/settings.js

@@ -1,11 +1,12 @@
 import { mkdir, readFile, stat, writeFile } from 'fs/promises';
-import { dirname, relative } from 'path';
+import { dirname, posix, relative } from 'path';
 import * as JSONC from 'comment-json';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'unix... Remove this comment to see the full error message
-import unixify from 'unixify';
+const toUnixPath = (path) => path.replace(/\\/g, '/');
 // @ts-expect-error TS(7006) FIXME: Parameter 'existingSettings' implicitly has an 'an... Remove this comment to see the full error message
 export const applySettings = (existingSettings, { denoBinary, edgeFunctionsPath, repositoryRoot }) => {
-    const relativeEdgeFunctionsPath = unixify(relative(repositoryRoot, edgeFunctionsPath));
+    // TODO(serhalp) I'm not convinced we want to convert to Unix paths on Windows? Does this even work? Was this a
+    // workaround for something, perhaps https://github.com/denoland/vscode_deno/pull/745?
+    const relativeEdgeFunctionsPath = toUnixPath(posix.normalize(relative(repositoryRoot, edgeFunctionsPath)));
     const settings = JSONC.assign(existingSettings, {
         'deno.enable': true,
         'deno.enablePaths': existingSettings['deno.enablePaths'] || [],