@netlify/config - npm Package Compare versions

Comparing version 0.4.9 to 0.4.10

package.json

 {
   "name": "@netlify/config",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Netlify config module",
@@ -43,3 +43,2 @@ "main": "src/main.js",
     "ava": "^2.4.0",
-    "cpy": "^8.1.0",
     "has-ansi": "^4.0.0"
@@ -46,0 +45,0 @@ },

src/files.js

 const { resolve } = require('path')
 
-// Make configuration paths relative to `buildDir`
-const handleFiles = function({ build, ...config }, buildDir) {
-  const buildA = PROP_NAMES.reduce((build, propName) => normalizePath(build, propName, buildDir), build)
+// Make configuration paths relative to `buildDir` and converts them to
+// absolute paths
+const handleFiles = function({ config: { build, ...config }, buildDir, repositoryRoot, baseRelDir }) {
+  const buildA = PROP_NAMES.reduce(
+    (build, propName) => normalizePath({ build, propName, buildDir, repositoryRoot, baseRelDir }),
+    build,
+  )
   return { ...config, build: buildA }
 }
 
-const PROP_NAMES = ['publish', 'functions']
+// All file paths in the configuration file
+const PROP_NAMES = ['base', 'publish', 'functions']
 
-const normalizePath = function(build, propName, buildDir) {
+const normalizePath = function({ build, propName, buildDir, repositoryRoot, baseRelDir }) {
   const path = build[propName]
@@ -18,6 +23,14 @@
 
-  const pathA = resolve(buildDir, path)
-  return { ...build, [propName]: pathA }
+  // `build.base` itself is never relative to `buildDir` since it is contained
+  // in it
+  const pathBase = baseRelDir && propName !== 'base' ? buildDir : repositoryRoot
+  const pathA = path.replace(LEADING_SLASH_REGEXP, '')
+  const pathB = resolve(pathBase, pathA)
+  return { ...build, [propName]: pathB }
 }
 
+// We allow paths in configuration file to start with /
+// In that case, those are actually relative paths not absolute.
+const LEADING_SLASH_REGEXP = /^\/+/
+
 module.exports = { handleFiles }

src/main.js

@@ -48,3 +48,3 @@ require('./utils/polyfills')
   const buildDir = getBuildDir(repositoryRoot, config)
-  const configA = handleFiles(config, buildDir)
+  const configA = handleFiles({ config, buildDir, repositoryRoot, baseRelDir })
 
@@ -51,0 +51,0 @@ return { configPath, buildDir, config: configA, context, branch }

No alert changes

Improved metrics

Total package byte prevSize

41554

increased by1.48%

Dev dependency count

2

decreased by-33.33%

Lines of code

1099

increased by1.1%

No dependency changes