OS fs

Author: bep

hugofs/hugofs_integration_test.go

@@ -61,14 +61,18 @@ Foo: {{ with $foo }}{{ .Content }}{{ else }}Fail{{ end }}
 [[module.mounts]]
 source = 'NODE_MODULES_SOURCE' # tries first in theme, then in project root
 target = 'assets/vendor/bootstrap'
+
 `
+	runFiles := func(files string) *hugolib.IntegrationTestBuilder {
+		return hugolib.Test(t, files, hugolib.TestOptOsFs())
+	}
 	files := strings.ReplaceAll(filesTemplate, "NODE_MODULES_SOURCE", "node_modules/bootstrap")
-	b := hugolib.Test(t, files)
+	b := runFiles(files)
 	b.AssertFileContent("public/index.html", "Foo: foo project.")
 
 	// This is for backwards compatibility. ../../node_modules/bootstrap works exactly the same as node_modules/bootstrap.
 	files = strings.ReplaceAll(filesTemplate, "NODE_MODULES_SOURCE", "../../node_modules/bootstrap")
-	b = hugolib.Test(t, files)
+	b = runFiles(files)
 	b.AssertFileContent("public/index.html", "Foo: foo project.")
 
 	files = strings.ReplaceAll(filesTemplate, "NODE_MODULES_SOURCE", "node_modules/bootstrap")
@@ -77,6 +81,6 @@ target = 'assets/vendor/bootstrap'
 foo theme.
 `
 
-	b = hugolib.Test(t, files)
+	b = runFiles(files)
 	b.AssertFileContent("public/index.html", "Foo: foo theme.")
 }

modules/collect.go

@@ -771,7 +771,7 @@ func (c *collector) normalizeMounts(owner *moduleAdapter, mounts []Mount) ([]Mou
 					// Make this a special case and also try relative to the project root.
 					sourceDir = filepath.Join(c.ccfg.WorkingDir, mnt.Source)
 					_, err := c.fs.Stat(sourceDir)
-					fmt.Printf("====> TODO1 remove2: %q => %v\n", sourceDir, err)
+					fmt.Printf("====> TODO1 remove2: %q => %v (%q)\n", sourceDir, err, mnt.Source)
 					if err != nil {
 						continue
 					}