Merge dagger.io/dagger/engine into dagger.io/dagger

Signed-off-by: Solomon Hykes <solomon@dagger.io>

pkg/universe.dagger.io/netlify/netlify.cue

@@ -4,7 +4,6 @@ package netlify
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 
 	"universe.dagger.io/alpine"
 	"universe.dagger.io/docker"
@@ -61,7 +60,7 @@ import (
 	container: bash.#Run & {
 		input: *_build.output | docker.#Image
 		script: {
-			_load: engine.#Source & {
+			_load: dagger.#Source & {
 				path: "."
 				include: ["*.sh"]
 			}

pkg/universe.dagger.io/netlify/test/test.cue

@@ -2,7 +2,6 @@ package netlify
 
 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine"
 
 	"universe.dagger.io/docker"
 	"universe.dagger.io/netlify"
@@ -29,8 +28,8 @@ dagger.#Plan & {
 
 			marker: "hello world"
 
-			data: engine.#WriteFile & {
-				input:    engine.#Scratch
+			data: dagger.#WriteFile & {
+				input:    dagger.#Scratch
 				path:     "index.html"
 				contents: marker
 			}