netlify-cli 17.11.0 → 17.12.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "17.11.0",
+  "version": "17.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.11.0",
+      "version": "17.12.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.11.0",
+  "version": "17.12.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {

package/src/commands/base-command.js

@@ -28,7 +28,7 @@ import inquirerAutocompletePrompt from 'inquirer-autocomplete-prompt';
 import merge from 'lodash/merge.js';
 import { NetlifyAPI } from 'netlify';
 import { getAgent } from '../lib/http-agent.js';
-import { NETLIFY_CYAN, USER_AGENT, chalk, error, exit, getToken, log, normalizeConfig, padLeft, pollForToken, sortOptions, warn, } from '../utils/command-helpers.js';
+import { NETLIFY_CYAN, USER_AGENT, chalk, error, exit, getToken, log, version, normalizeConfig, padLeft, pollForToken, sortOptions, warn, } from '../utils/command-helpers.js';
 import getGlobalConfig from '../utils/get-global-config.js';
 import { getSiteByName } from '../utils/get-site.js';
 import openBrowser from '../utils/open-browser.js';
@@ -434,7 +434,8 @@ class BaseCommand extends Command {
             token,
             ...apiUrlOpts,
         });
-        const { buildDir, config, configPath, repositoryRoot, siteInfo } = cachedConfig;
+        const { buildDir, config, configPath, env, repositoryRoot, siteInfo } = cachedConfig;
+        env.NETLIFY_CLI_VERSION = { sources: ['internal'], value: version };
         const normalizedConfig = normalizeConfig(config);
         const agent = await getAgent({
             httpProxy: flags.httpProxy,

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

@@ -7,8 +7,7 @@ import { chalk, error, 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);
-// @ts-expect-error TS(7031) FIXME: Binding element 'environment' implicitly has an 'a... Remove this comment to see the full error message
-const getTable = ({ environment, hideValues, scopesColumn }) => {
+const getTable = ({ environment, hideValues, scopesColumn, }) => {
     const table = new AsciiTable(`Environment variables`);
     const headings = ['Key', 'Value', scopesColumn && 'Scope'].filter(Boolean);
     table.setHeading(...headings);
@@ -16,10 +15,8 @@ const getTable = ({ environment, hideValues, scopesColumn }) => {
         // Key
         key,
         // Value
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
         hideValues ? MASK : variable.value || ' ',
         // Scope
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
         scopesColumn && getHumanReadableScopes(variable.scopes),
     ].filter(Boolean)));
     return table.toString();
@@ -43,20 +40,15 @@ export const envList = async (options, command) => {
         return false;
     }
     // filter out general sources
-    environment = Object.fromEntries(
-    // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-    Object.entries(environment).filter(([, variable]) => variable.sources[0] !== 'general'));
+    environment = Object.fromEntries(Object.entries(environment).filter(([, variable]) => variable.sources[0] !== 'general' && variable.sources[0] !== 'internal'));
     // Return json response for piping commands
     if (options.json) {
-        const envDictionary = Object.fromEntries(
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        Object.entries(environment).map(([key, variable]) => [key, variable.value]));
+        const envDictionary = Object.fromEntries(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(2571) FIXME: Object is of type 'unknown'.
             .map(([key, variable]) => `${key}=${variable.value}`)
             .join('\n');
         log(plaintext);

package/src/functions-templates/rust/hello-world/src/main.rs

@@ -7,7 +7,7 @@ use simple_logger::SimpleLogger;
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    SimpleLogger::new().with_level(LevelFilter::Info).init().unwrap();
+    SimpleLogger::new().with_utc_timestamps().with_level(LevelFilter::Info).init().unwrap();
 
     let func = handler_fn(my_handler);
     lambda_runtime::run(func).await?;
@@ -26,4 +26,4 @@ pub(crate) async fn my_handler(event: ApiGatewayProxyRequest, _ctx: Context) ->
     };
 
     Ok(resp)
-}
+}

package/src/lib/functions/server.js

@@ -35,15 +35,15 @@ const buildClientContext = function (headers) {
         //   "testData": "NETLIFY_DEV_LOCALLY_EMULATED_IDENTITY"
         // }
     };
-    // This data is available on both the context root and under custom.netlify for retro-compatibility.
-    // In the future it will only be available in custom.netlify.
-    // @ts-expect-error
-    const user = jwtDecode(parts[1]);
-    const netlifyContext = JSON.stringify({
-        identity: identity,
-        user: user,
-    });
     try {
+        // This data is available on both the context root and under custom.netlify for retro-compatibility.
+        // In the future it will only be available in custom.netlify.
+        // @ts-expect-error
+        const user = jwtDecode(parts[1]);
+        const netlifyContext = JSON.stringify({
+            identity: identity,
+            user: user,
+        });
         return {
             identity: identity,
             user: user,

package/src/utils/command-helpers.js

@@ -40,7 +40,8 @@ export const chalk = safeChalk(argv.includes('--json'));
 export const padLeft = (str, count, filler = ' ') => str.padStart(str.length + count, filler);
 const platform = WSL ? 'wsl' : os.platform();
 const arch = os.arch() === 'ia32' ? 'x86' : os.arch();
-const { name, version } = await getPackageJson();
+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']);