@netlify/config 17.0.15 → 17.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "17.0.15",
+  "version": "17.0.18",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./src/main.js",
@@ -66,7 +66,7 @@
     "map-obj": "^5.0.0",
     "netlify": "^11.0.0",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-redirect-parser": "13.0.4",
+    "netlify-redirect-parser": "13.0.5",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
     "path-exists": "^5.0.0",
@@ -77,7 +77,7 @@
     "yargs": "^17.3.1"
   },
   "devDependencies": {
-    "ava": "^3.15.0",
+    "ava": "^4.0.0",
     "del": "^6.0.0",
     "has-ansi": "^5.0.0",
     "is-ci": "^3.0.0",

package/src/env/main.js

@@ -68,7 +68,8 @@ export const getEnv = async function ({
 // Environment variables not set by users, but meant to mimic the production
 // environment.
 const getGeneralEnv = async function ({
-  siteInfo: { id, name, url, build_settings: { repo_url: REPOSITORY_URL } = {} },
+  siteInfo,
+  siteInfo: { id, name },
   buildDir,
   branch,
   deployId,
@@ -76,13 +77,13 @@ const getGeneralEnv = async function ({
   context,
 }) {
   const gitEnv = await getGitEnv(buildDir, branch)
+  const deployUrls = getDeployUrls({ siteInfo, branch, deployId })
   return removeFalsy({
     SITE_ID: id,
     SITE_NAME: name,
     DEPLOY_ID: deployId,
     BUILD_ID: buildId,
-    URL: url,
-    REPOSITORY_URL,
+    ...deployUrls,
     CONTEXT: context,
     NETLIFY_LOCAL: 'true',
     ...gitEnv,
@@ -96,6 +97,23 @@ const getGeneralEnv = async function ({
   })
 }
 
+const getDeployUrls = function ({
+  siteInfo: { name = DEFAULT_SITE_NAME, ssl_url: sslUrl, build_settings: { repo_url: REPOSITORY_URL } = {} },
+  branch,
+  deployId,
+}) {
+  return {
+    URL: sslUrl,
+    REPOSITORY_URL,
+    DEPLOY_PRIME_URL: `https://${branch}--${name}${NETLIFY_DEFAULT_DOMAIN}`,
+    DEPLOY_URL: `https://${deployId}--${name}${NETLIFY_DEFAULT_DOMAIN}`,
+  }
+}
+
+const NETLIFY_DEFAULT_DOMAIN = '.netlify.app'
+// `site.name` is `undefined` when there is no token or siteId
+const DEFAULT_SITE_NAME = 'site-name'
+
 // Environment variables specified by the user
 const getUserEnv = function ({ config, siteInfo, accounts, addons }) {
   const accountEnv = getAccountEnv({ siteInfo, accounts })
@@ -155,10 +173,6 @@ const READONLY_ENV = [
   'NETLIFY_LOCAL',
 
   // Not set in local builds because there is no CI build/deploy, incoming hooks nor PR
-  'BUILD_ID',
-  'DEPLOY_ID',
-  'DEPLOY_PRIME_URL',
-  'DEPLOY_URL',
   'INCOMING_HOOK_BODY',
   'INCOMING_HOOK_TITLE',
   'INCOMING_HOOK_URL',

package/src/options/main.js

@@ -44,7 +44,8 @@ const getDefaultOpts = function ({ env: envOpt = {}, cwd: cwdOpt, defaultConfig
     host: combinedEnv.NETLIFY_API_HOST,
     token: combinedEnv.NETLIFY_AUTH_TOKEN,
     siteId: combinedEnv.NETLIFY_SITE_ID,
-    deployId: combinedEnv.DEPLOY_ID,
+    deployId: combinedEnv.DEPLOY_ID || DEFAULT_DEPLOY_ID,
+    buildId: combinedEnv.BUILD_ID || DEFAULT_BUILD_ID,
     mode: 'require',
     offline: false,
     debug: getDefaultDebug(combinedEnv, defaultConfig),
@@ -55,6 +56,10 @@ const getDefaultOpts = function ({ env: envOpt = {}, cwd: cwdOpt, defaultConfig
   }
 }
 
+// Local builds do not have any deploys, so some dummy ids are used instead
+const DEFAULT_DEPLOY_ID = '0'
+const DEFAULT_BUILD_ID = '0'
+
 // --debug can be set using an environment variable `NETLIFY_BUILD_DEBUG` either
 // locally or in the UI build settings
 const getDefaultDebug = function (combinedEnv, { build: { environment = {} } = {} }) {