netlify-cli 10.18.0 → 11.0.0

package/npm-shrinkwrap.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.18.0",
+  "version": "11.0.0",
   "author": "Netlify Inc.",
   "contributors": [
     "@whitep4nth3r (https://twitter.com/whitep4nth3r)",

package/src/commands/dev/dev.js

@@ -54,6 +54,8 @@ const {
 
 const { createDevExecCommand } = require('./dev-exec')
 
+const netlifyBuildPromise = import('@netlify/build')
+
 const startStaticServer = async ({ settings }) => {
   const server = new StaticServer({
     rootPath: settings.dist,
@@ -417,7 +419,8 @@ const validateGeoCountryCode = (arg) => {
  */
 const dev = async (options, command) => {
   log(`${NETLIFYDEV}`)
-  const { api, config, repositoryRoot, site, siteInfo, state } = command.netlify
+  const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify
+  const netlifyBuild = await netlifyBuildPromise
   config.dev = { ...config.dev }
   config.build = { ...config.build }
   /** @type {import('./types').DevConfig} */
@@ -429,7 +432,7 @@ const dev = async (options, command) => {
     ...options,
   }
 
-  let { env } = command.netlify.cachedConfig
+  let { env } = cachedConfig
   if (!options.offline && siteInfo.use_envelope) {
     env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo })
   }
@@ -449,6 +452,26 @@ const dev = async (options, command) => {
   let settings = {}
   try {
     settings = await detectServerSettings(devConfig, options, site.root)
+
+    // If there are plugins that we should be running for this site, add them
+    // to the config as if they were declared in netlify.toml. We must check
+    // whether the plugin has already been added by another source (like the
+    // TOML file or the UI), as we don't want to run the same plugin twice.
+    if (settings.plugins) {
+      const { plugins: existingPlugins = [] } = cachedConfig.config
+      const existingPluginNames = new Set(existingPlugins.map((plugin) => plugin.package))
+      const newPlugins = settings.plugins
+        .map((pluginName) => {
+          if (existingPluginNames.has(pluginName)) {
+            return
+          }
+
+          return { package: pluginName, origin: 'config', inputs: {} }
+        })
+        .filter(Boolean)
+
+      cachedConfig.config.plugins = [...newPlugins, ...cachedConfig.config.plugins]
+    }
   } catch (error_) {
     log(NETLIFYDEVERR, error_.message)
     exit(1)
@@ -472,7 +495,19 @@ const dev = async (options, command) => {
     capabilities,
     timeouts,
   })
-  await startFrameworkServer({ settings })
+
+  log(`${NETLIFYDEVWARN} Setting up local development server`)
+
+  const devCommand = () => startFrameworkServer({ settings })
+  const startDevOptions = getBuildOptions({
+    cachedConfig,
+    options,
+  })
+  const { error: startDevError, success } = await netlifyBuild.startDev(devCommand, startDevOptions)
+
+  if (!success) {
+    error(`Could not start local development server\n\n${startDevError.message}\n\n${startDevError.stack}`)
+  }
 
   // TODO: We should consolidate this with the existing config watcher.
   const getUpdatedConfig = async () => {
@@ -612,6 +647,19 @@ const dev = async (options, command) => {
   printBanner({ url })
 }
 
+const getBuildOptions = ({ cachedConfig, options: { context, cwd = process.cwd(), debug, dry, offline }, token }) => ({
+  cachedConfig,
+  token,
+  dry,
+  debug,
+  context,
+  mode: 'cli',
+  telemetry: false,
+  buffer: false,
+  offline,
+  cwd,
+})
+
 /**
  * Creates the `netlify dev` command
  * @param {import('../base-command').BaseCommand} program

package/src/utils/detect-server-settings.js

@@ -167,6 +167,7 @@ const getSettingsFromFramework = (framework) => {
     name: frameworkName,
     staticAssetsDirectory: staticDir,
     env = {},
+    plugins,
   } = framework
 
   return {
@@ -176,6 +177,7 @@ const getSettingsFromFramework = (framework) => {
     framework: frameworkName,
     env,
     pollingStrategies: pollingStrategies.map(({ name }) => name),
+    plugins,
   }
 }
 
@@ -311,6 +313,8 @@ const detectServerSettings = async (devConfig, options, projectDir) => {
       validateFrameworkConfig({ devConfig })
       settings = await mergeSettings({ devConfig, frameworkSettings })
     }
+
+    settings.plugins = frameworkSettings && frameworkSettings.plugins
   } else if (devConfig.framework === '#custom') {
     validateFrameworkConfig({ devConfig })
     // when the users wants to configure `command` and `targetPort`