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

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

tests/tasks/exec/mount_cache.cue

@@ -1,20 +1,20 @@
 package main
 
 import (
-	"dagger.io/dagger/engine"
+	"dagger.io/dagger"
 )
 
-engine.#Plan & {
+dagger.#Plan & {
 	actions: {
-		image: engine.#Pull & {
+		image: dagger.#Pull & {
 			source: "alpine:3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
 		}
 
-		sharedCache: engine.#CacheDir & {
+		sharedCache: dagger.#CacheDir & {
 			id: "mycache"
 		}
 
-		exec: engine.#Exec & {
+		exec: dagger.#Exec & {
 			input: image.output
 			mounts: cache: {
 				dest:     "/cache"
@@ -28,7 +28,7 @@ engine.#Plan & {
 			]
 		}
 
-		verify: engine.#Exec & {
+		verify: dagger.#Exec & {
 			input: image.output
 			mounts: cache: {
 				dest:     "/cache"
@@ -43,10 +43,10 @@ engine.#Plan & {
 			]
 		}
 
-		otherCache: engine.#CacheDir & {
+		otherCache: dagger.#CacheDir & {
 			id: "othercache"
 		}
-		verifyOtherCache: engine.#Exec & {
+		verifyOtherCache: dagger.#Exec & {
 			input: image.output
 			mounts: cache: {
 				dest:     "/cache"