netlify-cli 13.2.2 → 14.0.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "13.2.2",
+  "version": "14.0.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
-    "node": "^14.16.0 || >=16.0.0"
+    "node": "^14.18.0 || >=16.0.0"
   },
   "files": [
     "/bin",
@@ -38,50 +38,17 @@
     "url": "https://github.com/netlify/cli/issues"
   },
   "scripts": {
-    "prepare": "husky install node_modules/@netlify/eslint-config-node/.husky/",
-    "start": "node ./bin/run.mjs",
-    "test": "run-s format test:dev",
-    "format": "run-s format:check-fix:*",
-    "format:ci": "run-s format:check:*",
-    "format:check-fix:lint": "run-e format:check:lint format:fix:lint",
-    "format:check:lint": "cross-env-shell eslint $npm_package_config_eslint",
-    "format:fix:lint": "cross-env-shell eslint --fix $npm_package_config_eslint",
-    "format:check-fix:prettier": "run-e format:check:prettier format:fix:prettier",
-    "format:check:prettier": "cross-env-shell prettier --check $npm_package_config_prettier",
-    "format:fix:prettier": "cross-env-shell prettier --write $npm_package_config_prettier",
-    "test:dev": "run-s certs test:init:* test:dev:*",
-    "test:init": "run-s test:init:*",
-    "test:init:cli-version": "npm run start -- --version",
-    "test:init:cli-help": "npm run start -- --help",
-    "test:init:eleventy-deps": "npm ci --prefix tests/integration/eleventy-site --no-audit",
-    "test:init:hugo-deps": "npm ci --prefix tests/integration/hugo-site --no-audit",
-    "test:dev:ava": "ava --verbose",
-    "test:dev:vitest": "vitest run tests/unit/ && vitest run tests/integration",
-    "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/",
-    "test:ci:vitest:unit": "vitest run --coverage tests/unit/",
-    "test:ci:vitest:integration": "vitest run --coverage tests/integration/",
-    "test:affected": "node ./tools/affected-test.mjs",
-    "e2e": "node ./tools/e2e/run.mjs",
-    "docs": "node ./site/scripts/docs.mjs",
-    "watch": "c8 --reporter=lcov ava --watch",
-    "site:build": "run-s site:build:*",
-    "site:build:install": "cd site && npm ci --no-audit",
-    "site:build:assets": "cd site && npm run build",
     "postinstall": "node ./scripts/postinstall.mjs",
-    "certs": "openssl req -x509 -out localhost.crt -keyout localhost.key -newkey rsa:2048 -nodes -sha256 -subj \"/CN=localhost\" -extensions EXT -config certconf"
-  },
-  "config": {
-    "eslint": "--cache --format=codeframe --max-warnings=0 \"{src,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,html}\" \"*.{mjs,cjs,js,md,html}\" \".*.{mjs,cjs,js,md,html}\"",
-    "prettier": "--ignore-path .eslintignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
+    "prepublishOnly": "node ./scripts/prepare-for-publish.mjs"
   },
   "dependencies": {
     "@fastify/static": "^6.6.0",
-    "@netlify/build": "^29.8.0",
+    "@netlify/build": "^29.9.2",
     "@netlify/config": "^20.3.7",
-    "@netlify/edge-bundler": "^8.13.0",
+    "@netlify/edge-bundler": "^8.13.2",
     "@netlify/framework-info": "^9.8.5",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/zip-it-and-ship-it": "^8.9.0",
+    "@netlify/zip-it-and-ship-it": "^8.10.0",
     "@octokit/rest": "^19.0.0",
     "ansi-escapes": "^6.0.0",
     "ansi-styles": "^5.0.0",
@@ -150,15 +117,15 @@
     "netlify-redirect-parser": "^14.1.2",
     "netlify-redirector": "^0.4.0",
     "node-fetch": "^2.6.0",
-    "node-version-alias": "^2.0.0",
+    "node-version-alias": "^3.0.0",
     "ora": "^6.0.0",
     "p-filter": "^3.0.0",
     "p-map": "^5.0.0",
-    "p-wait-for": "^3.0.0",
+    "p-wait-for": "^5.0.0",
     "parallel-transform": "^1.2.0",
     "parse-github-url": "^1.0.2",
     "parse-gitignore": "^2.0.0",
-    "path-key": "^3.1.1",
+    "path-key": "^4.0.0",
     "prettyjson": "^1.2.1",
     "pump": "^3.0.0",
     "raw-body": "^2.4.1",
@@ -169,7 +136,7 @@
     "strip-ansi-control-characters": "^2.0.0",
     "tabtab": "^3.0.2",
     "tempy": "^3.0.0",
-    "terminal-link": "^2.1.1",
+    "terminal-link": "^3.0.0",
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-readable-stream": "^2.1.0",
@@ -180,46 +147,6 @@
     "uuid": "^9.0.0",
     "wait-port": "^1.0.1",
     "winston": "^3.2.1",
-    "write-file-atomic": "^4.0.0"
-  },
-  "devDependencies": {
-    "@babel/preset-react": "^7.12.13",
-    "@netlify/eslint-config-node": "^7.0.0",
-    "@vitest/coverage-c8": "^0.29.7",
-    "ava": "^4.0.0",
-    "c8": "^7.11.0",
-    "cpy": "^9.0.1",
-    "eslint-plugin-sort-destructure-keys": "^1.3.5",
-    "fast-glob": "^3.2.7",
-    "form-data": "^4.0.0",
-    "got": "^11.8.6",
-    "graphviz": "^0.0.9",
-    "husky": "^8.0.0",
-    "ini": "^2.0.0",
-    "mock-fs": "^5.1.2",
-    "nock": "^13.2.4",
-    "p-timeout": "^4.0.0",
-    "rewiremock": "^3.14.3",
-    "serialize-javascript": "^6.0.0",
-    "sinon": "^14.0.0",
-    "strip-ansi": "^7.0.0",
-    "temp-dir": "^2.0.0",
-    "tomlify-j0.4": "^3.0.0",
-    "tree-kill": "^1.2.2",
-    "typescript": "^4.4.4",
-    "verdaccio": "^5.22.1",
-    "vitest": "^0.29.7"
-  },
-  "ava": {
-    "files": [
-      "tools/**/*.test.mjs",
-      "tests/**/*.test.cjs"
-    ],
-    "cache": true,
-    "concurrency": 5,
-    "failFast": false,
-    "failWithoutAssertions": false,
-    "tap": false,
-    "timeout": "5m"
+    "write-file-atomic": "^5.0.0"
   }
-}
+}

package/src/commands/dev/dev-exec.mjs

@@ -1,6 +1,6 @@
 import execa from 'execa'
 
-import { injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 
 /**
@@ -16,7 +16,8 @@ const devExec = async (cmd, options, command) => {
     env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
   }
 
-  await injectEnvVariables({ devConfig: { ...config.dev }, env, site })
+  env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site })
+  injectEnvVariables(env)
 
   await execa(cmd, command.args.slice(1), {
     stdio: 'inherit',

package/src/commands/dev/dev.mjs

@@ -18,13 +18,14 @@ import {
   normalizeConfig,
 } from '../../utils/command-helpers.mjs'
 import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.mjs'
-import { getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
 import { startNetlifyGraph, startPollingForAPIAuthentication } from '../../utils/graph.mjs'
 import { startLiveTunnel } from '../../utils/live-tunnel.mjs'
 import openBrowser from '../../utils/open-browser.mjs'
 import { generateInspectSettings, startProxyServer } from '../../utils/proxy-server.mjs'
+import { getProxyUrl } from '../../utils/proxy.mjs'
 import { runDevTimeline } from '../../utils/run-build.mjs'
 import { getGeoCountryArgParser } from '../../utils/validation.mjs'
 
@@ -95,7 +96,8 @@ const dev = async (options, command) => {
     log(`${NETLIFYDEVLOG} Injecting environment variable values for ${chalk.yellow('all scopes')}`)
   }
 
-  await injectEnvVariables({ devConfig, env, site })
+  env = await getDotEnvVariables({ devConfig, env, site })
+  injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
   const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({
@@ -124,9 +126,23 @@ const dev = async (options, command) => {
     startPollingForAPIAuthentication({ api, command, config, site, siteInfo })
   }
 
+  const liveTunnelUrl = await handleLiveTunnel({ options, site, api, settings })
+  const url = liveTunnelUrl || getProxyUrl(settings)
+  process.env.URL = url
+  process.env.DEPLOY_URL = url
+
   log(`${NETLIFYDEVWARN} Setting up local development server`)
 
-  const { configPath: configPathOverride } = await runDevTimeline({ cachedConfig, options, settings, site })
+  const { configPath: configPathOverride } = await runDevTimeline({
+    cachedConfig,
+    options,
+    settings,
+    site,
+    env: {
+      URL: url,
+      DEPLOY_URL: url,
+    },
+  })
 
   await startFunctionsServer({
     api,
@@ -159,7 +175,7 @@ const dev = async (options, command) => {
 
   const inspectSettings = generateInspectSettings(options.edgeInspect, options.edgeInspectBrk)
 
-  let url = await startProxyServer({
+  await startProxyServer({
     addonsUrls,
     config,
     configPath: configPathOverride,
@@ -176,16 +192,10 @@ const dev = async (options, command) => {
     state,
   })
 
-  const liveTunnelUrl = await handleLiveTunnel({ options, site, api, settings })
-  url = liveTunnelUrl || url
-
   if (devConfig.autoLaunch !== false) {
     await openBrowser({ url, silentBrowserNoneError: true })
   }
 
-  process.env.URL = url
-  process.env.DEPLOY_URL = url
-
   await startNetlifyGraph({
     command,
     config,

package/src/commands/functions/functions-create.mjs

@@ -19,7 +19,7 @@ import ora from 'ora'
 import { fileExistsAsync } from '../../lib/fs.mjs'
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.mjs'
 import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.mjs'
-import { injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, injectEnvVariables } from '../../utils/dev.mjs'
 import execa from '../../utils/execa.mjs'
 import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.mjs'
 
@@ -549,11 +549,12 @@ const handleOnComplete = async ({ command, onComplete }) => {
   const { config } = command.netlify
 
   if (onComplete) {
-    await injectEnvVariables({
+    const env = await getDotEnvVariables({
       devConfig: { ...config.dev },
       env: command.netlify.cachedConfig.env,
       site: command.netlify.site,
     })
+    injectEnvVariables(env)
     await onComplete.call(command)
   }
 }

package/src/commands/functions/functions-serve.mjs

@@ -2,7 +2,7 @@
 import { join } from 'path'
 
 import { startFunctionsServer } from '../../lib/functions/server.mjs'
-import { acquirePort, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
+import { acquirePort, getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getFunctionsDir } from '../../utils/functions/index.mjs'
 
 const DEFAULT_PORT = 9999
@@ -16,11 +16,12 @@ const functionsServe = async (options, command) => {
   const { api, config, site, siteInfo } = command.netlify
 
   const functionsDir = getFunctionsDir({ options, config }, join('netlify', 'functions'))
-  const { env } = command.netlify.cachedConfig
+  let { env } = command.netlify.cachedConfig
 
   env.NETLIFY_DEV = { sources: ['internal'], value: 'true' }
 
-  await injectEnvVariables({ devConfig: { ...config.dev }, env, site })
+  env = await getDotEnvVariables({ devConfig: { ...config.dev }, env, site })
+  injectEnvVariables(env)
 
   const { capabilities, siteUrl, timeouts } = await getSiteInformation({
     offline: options.offline,

package/src/commands/functions/functions.mjs

@@ -39,7 +39,7 @@ The ${name} command will help you manage the functions in this site`,
     )
     .addExamples([
       'netlify functions:create --name function-xyz',
-      'netlify functions:build --name function-abc --timeout 30s',
+      'netlify functions:build --functions build/to/directory --src source/directory',
     ])
     .action(functions)
 }

package/src/commands/serve/serve.mjs

@@ -16,7 +16,7 @@ import {
   normalizeConfig,
 } from '../../utils/command-helpers.mjs'
 import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.mjs'
-import { getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
+import { getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 import { getInternalFunctionsDir } from '../../utils/functions/functions.mjs'
 import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
@@ -52,7 +52,8 @@ const serve = async (options, command) => {
     log(`${NETLIFYDEVLOG} Injecting environment variable values for ${chalk.yellow('all scopes')}`)
   }
 
-  await injectEnvVariables({ devConfig, env, site })
+  env = await getDotEnvVariables({ devConfig, env, site })
+  injectEnvVariables(env)
   await promptEditorHelper({ chalk, config, log, NETLIFYDEVLOG, repositoryRoot, state })
 
   const { addonsUrls, capabilities, siteUrl, timeouts } = await getSiteInformation({

package/src/commands/watch/watch.mjs

@@ -42,8 +42,10 @@ const waitForBuildFinish = async function (api, siteId, spinner) {
 
   await pWaitFor(waitForBuildToFinish, {
     interval: BUILD_FINISH_INTERVAL,
-    timeout: BUILD_FINISH_TIMEOUT,
-    message: 'Timeout while waiting for deploy to finish',
+    timeout: {
+      milliseconds: BUILD_FINISH_TIMEOUT,
+      message: 'Timeout while waiting for deploy to finish',
+    },
   })
 
   // return only when build done or timeout happens

package/src/functions-templates/javascript/google-analytics/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "engines": {
-    "node": "^14.16.0 || >=16.0.0"
+    "node": "^14.18.0 || >=16.0.0"
   },
   "keywords": [
     "netlify",

package/src/functions-templates/javascript/token-hider/package-lock.json

@@ -19,9 +19,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "node_modules/axios": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
-      "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
+      "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -198,9 +198,9 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "axios": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz",
-      "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
+      "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",

package/src/functions-templates/typescript/hello-world/package-lock.json

@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.40",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.40.tgz",
-      "integrity": "sha512-pGteXO/JQX7wPxGR8lyT+doqjMa7XvlVowwrDwLfX92k5SdLkk4cwC7CYSLBxrenw/R5oQwKioVIak7ZgplM3g=="
+      "version": "14.18.42",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz",
+      "integrity": "sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.40",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.40.tgz",
-      "integrity": "sha512-pGteXO/JQX7wPxGR8lyT+doqjMa7XvlVowwrDwLfX92k5SdLkk4cwC7CYSLBxrenw/R5oQwKioVIak7ZgplM3g=="
+      "version": "14.18.42",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.42.tgz",
+      "integrity": "sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/lib/edge-functions/bootstrap.mjs

@@ -1,5 +1,5 @@
 import { env } from 'process'
 
-const latestBootstrapURL = 'https://6419767d9dc968000848742a--edge.netlify.com/bootstrap/index-combined.ts'
+const latestBootstrapURL = 'https://643581608391e3000851cc94--edge.netlify.com/bootstrap/index-combined.ts'
 
 export const getBootstrapURL = () => env.NETLIFY_EDGE_BOOTSTRAP || latestBootstrapURL

package/src/lib/edge-functions/proxy.mjs

@@ -79,11 +79,12 @@ export const initializeProxy = async ({
   const server = prepareServer({
     config,
     configPath,
-    directories: [internalFunctionsPath, userFunctionsPath].filter(Boolean),
+    directory: userFunctionsPath,
     env: configEnv,
     getUpdatedConfig,
     importMaps: [importMap].filter(Boolean),
     inspectSettings,
+    internalDirectory: internalFunctionsPath,
     internalFunctions,
     port: isolatePort,
     projectDir,
@@ -153,11 +154,12 @@ export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined
 const prepareServer = async ({
   config,
   configPath,
-  directories,
+  directory,
   env: configEnv,
   getUpdatedConfig,
   importMaps,
   inspectSettings,
+  internalDirectory,
   internalFunctions,
   port,
   projectDir,
@@ -187,9 +189,10 @@ const prepareServer = async ({
       bundler,
       config,
       configPath,
-      directories,
+      directories: [directory].filter(Boolean),
       env: configEnv,
       getUpdatedConfig,
+      internalDirectories: [internalDirectory].filter(Boolean),
       internalFunctions,
       projectDir,
       runIsolate,