chore: fix integration merge conflicts

vercel · May 21, 2024 · e59b85c · e59b85c
1 parent 56c1d88
commit e59b85c
Show file tree

Hide file tree

Showing 45 changed files with 232 additions and 1,137 deletions.
diff --git a/crates/turborepo-lib/src/hash/mod.rs b/crates/turborepo-lib/src/hash/mod.rs
@@ -408,7 +408,7 @@ mod test {
             framework_inference: true,
         };
 
-        assert_eq!(global_hash.hash(), "c8f1724ea37eb6cd");
+        assert_eq!(global_hash.hash(), "9f06917065be0a72");
     }
 
     #[test_case(vec![], "459c029558afe716" ; "empty")]

diff --git a/turborepo-tests/integration/tests/dry-json/monorepo.t b/turborepo-tests/integration/tests/dry-json/monorepo.t
@@ -49,15 +49,7 @@ Setup
     "taskId": "my-app#build",
     "task": "build",
     "package": "my-app",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "61394a550211cbe8",
-=======
-    "hash": "dea27cc2fbbcfe2c",
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "709525604475409a",
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "ed450f573b231cb7",
     "inputs": {
       ".env.local": "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
       "package.json": "1746e0db2361085b5953a6a3beab08c24af5bc08"
@@ -117,15 +109,7 @@ Setup
     "taskId": "util#build",
     "task": "build",
     "package": "util",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "d30fc4474534c30e",
-=======
-    "hash": "e09943c27ed0a75d",
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "98d1cf4886bbc73d",
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "41b033e352a43533",
     "inputs": {
       "package.json": "e755064fd7893809d10fc067bb409c7ae516327f"
     },

diff --git a/turborepo-tests/integration/tests/dry-json/single-package-no-config.t b/turborepo-tests/integration/tests/dry-json/single-package-no-config.t
@@ -32,15 +32,7 @@ Setup
       {
         "taskId": "build",
         "task": "build",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        "hash": "10229b8c4ed48f95",
-=======
-        "hash": "64c6a531cb00bb47",
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-        "hash": "9cff709a1e22ead6",
->>>>>>> 37c3c596f1 (chore: update integration tests)
+        "hash": "a6da7b8ddbe2bb84",
         "inputs": {
           ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83",
           "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021",

diff --git a/turborepo-tests/integration/tests/dry-json/single-package-with-deps.t b/turborepo-tests/integration/tests/dry-json/single-package-with-deps.t
@@ -31,11 +31,7 @@ Setup
       {
         "taskId": "build",
         "task": "build",
-<<<<<<< HEAD
-        "hash": "fbef1dba65f21ba4",
-=======
-        "hash": "b69493e87ea97b0e",
->>>>>>> 37c3c596f1 (chore: update integration tests)
+        "hash": "4047a6e65d7dafef",
         "inputs": {
           ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83",
           "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021",
@@ -90,11 +86,7 @@ Setup
       {
         "taskId": "test",
         "task": "test",
-<<<<<<< HEAD
-        "hash": "75187c3aff97a0a8",
-=======
-        "hash": "29571ce1244345cc",
->>>>>>> 37c3c596f1 (chore: update integration tests)
+        "hash": "89d72e7337505ef6",
         "inputs": {
           ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83",
           "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021",

diff --git a/turborepo-tests/integration/tests/dry-json/single-package.t b/turborepo-tests/integration/tests/dry-json/single-package.t
@@ -31,11 +31,7 @@ Setup
       {
         "taskId": "build",
         "task": "build",
-<<<<<<< HEAD
-        "hash": "fbef1dba65f21ba4",
-=======
-        "hash": "b69493e87ea97b0e",
->>>>>>> 37c3c596f1 (chore: update integration tests)
+        "hash": "4047a6e65d7dafef",
         "inputs": {
           ".gitignore": "03b541460c1b836f96f9c0a941ceb48e91a9fd83",
           "package-lock.json": "1c117cce37347befafe3a9cba1b8a609b3600021",

diff --git a/turborepo-tests/integration/tests/dry-run.t b/turborepo-tests/integration/tests/dry-run.t
@@ -18,12 +18,7 @@ Setup
   Global Hash Inputs
     Global Files                          = 1
     External Dependencies Hash            = 459c029558afe716
-<<<<<<< HEAD
-    Global Cache Key                      = HEY STELLLLLLLAAAAAAAAAAAAA
-=======
     Global Cache Key                      = I can\xe2\x80\x99t see ya, but I know you\xe2\x80\x99re here (esc)
-    Global .env Files Considered          = 0
->>>>>>> 2eae5cbd82 (Update tests)
     Global Env Vars                       = SOME_ENV_VAR
     Global Env Vars Values                = 
     Inferred Global Env Vars Values       = 
@@ -35,57 +30,41 @@ Setup
   my-app#build
     Task                           = build\s* (re)
     Package                        = my-app\s* (re)
-<<<<<<< HEAD
-<<<<<<< HEAD
-    Hash                           = 61394a550211cbe8\s* (re)
-=======
-    Hash                           = dea27cc2fbbcfe2c
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    Hash                           = 709525604475409a
->>>>>>> 37c3c596f1 (chore: update integration tests)
-    Cached \(Local\)                 = false\s* (re)
-    Cached \(Remote\)                = false\s* (re)
-    Directory                      = apps(\/|\\)my-app\s* (re)
-    Command                        = echo building\s* (re)
-    Outputs                        = apple.json, banana.txt\s* (re)
-    Log File                       = apps(\/|\\)my-app(\/|\\)\.turbo(\/|\\)turbo-build\.log\s* (re)
-    Dependencies                   =\s* (re)
-    Dependents                     =\s* (re)
-    Inputs Files Considered        = 2\s* (re)
-    Env Vars                       =\s* (re)
-    Env Vars Values                =\s* (re)
-    Inferred Env Vars Values       =\s* (re)
-    Passed Through Env Vars        =\s* (re)
-    Passed Through Env Vars Values =\s* (re)
+    Hash                           = ed450f573b231cb7
+    Cached (Local)                 = false
+    Cached (Remote)                = false
+    Directory                      = apps/my-app
+    Command                        = echo building
+    Outputs                        = apple.json, banana.txt
+    Log File                       = apps/my-app/.turbo/turbo-build.log
+    Dependencies                   = 
+    Dependents                     = 
+    Inputs Files Considered        = 2
+    Env Vars                       = 
+    Env Vars Values                = 
+    Inferred Env Vars Values       = 
+    Passed Through Env Vars        = 
+    Passed Through Env Vars Values = 
 
   $ cat tmp-3.txt | grep "util#build" -A 17
   util#build
     Task                           = build\s* (re)
     Package                        = util\s* (re)
-<<<<<<< HEAD
-<<<<<<< HEAD
-    Hash                           = d30fc4474534c30e\s* (re)
-=======
-    Hash                           = e09943c27ed0a75d
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    Hash                           = 98d1cf4886bbc73d
->>>>>>> 37c3c596f1 (chore: update integration tests)
-    Cached \(Local\)                 = false\s* (re)
-    Cached \(Remote\)                = false\s* (re)
-    Directory                      = packages(\/|\\)util\s* (re)
-    Command                        = echo building\s* (re)
-    Outputs                        =\s* (re)
-    Log File                       = packages(\/|\\)util(\/|\\)\.turbo(\/|\\)turbo-build\.log\s* (re)
-    Dependencies                   =\s* (re)
-    Dependents                     =\s* (re)
-    Inputs Files Considered        = 1\s* (re)
-    Env Vars                       = NODE_ENV\s* (re)
-    Env Vars Values                =\s* (re)
-    Inferred Env Vars Values       =\s* (re)
-    Passed Through Env Vars        =\s* (re)
-    Passed Through Env Vars Values =\s* (re)
+    Hash                           = 41b033e352a43533
+    Cached (Local)                 = false
+    Cached (Remote)                = false
+    Directory                      = packages/util
+    Command                        = echo building
+    Outputs                        = 
+    Log File                       = packages/util/.turbo/turbo-build.log
+    Dependencies                   = 
+    Dependents                     = 
+    Inputs Files Considered        = 1
+    Env Vars                       = NODE_ENV
+    Env Vars Values                = 
+    Inferred Env Vars Values       = 
+    Passed Through Env Vars        = 
+    Passed Through Env Vars Values = 
 
 # Run the task with NODE_ENV set and see it in summary. Use util package so it's just one package
   $ NODE_ENV=banana ${TURBO} run build --dry --filter=util | grep "Environment Variables"

diff --git a/turborepo-tests/integration/tests/edit-turbo-json/task.t b/turborepo-tests/integration/tests/edit-turbo-json/task.t
@@ -6,143 +6,63 @@ Baseline task hashes
   $ ${TURBO} build --dry=json | jq -r '.tasks | sort_by(.taskId)[] | {taskId, hash}'
   {
     "taskId": "another#build",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "1d62465edaa86a4e"
+    "hash": "78b732d9478d9b83"
   }
   {
     "taskId": "my-app#build",
-    "hash": "61394a550211cbe8"
+    "hash": "ed450f573b231cb7"
   }
   {
     "taskId": "util#build",
-    "hash": "d30fc4474534c30e"
-=======
-    "hash": "39902e236d45b17a"
-=======
-    "hash": "843536e46620dad2"
->>>>>>> 37c3c596f1 (chore: update integration tests)
-  }
-  {
-    "taskId": "my-app#build",
-    "hash": "bbfabe4612171fc1"
-  }
-  {
-    "taskId": "util#build",
-<<<<<<< HEAD
-    "hash": "e09943c27ed0a75d"
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "98d1cf4886bbc73d"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "41b033e352a43533"
   }
 
 Change only my-app#build
   $ cp "$TESTDIR/fixture-configs/b-change-only-my-app.json" "$(pwd)/turbo.json" && git commit -am "no comment" --quiet
   $ ${TURBO} build --dry=json | jq -r '.tasks | sort_by(.taskId)[] | {taskId, hash}'
   {
     "taskId": "another#build",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "1d62465edaa86a4e"
+    "hash": "78b732d9478d9b83"
   }
   {
     "taskId": "my-app#build",
-    "hash": "1d7be3c12072f23c"
+    "hash": "eb391860afd5dfdc"
   }
   {
     "taskId": "util#build",
-    "hash": "d30fc4474534c30e"
-=======
-    "hash": "39902e236d45b17a"
-=======
-    "hash": "843536e46620dad2"
->>>>>>> 37c3c596f1 (chore: update integration tests)
-  }
-  {
-    "taskId": "my-app#build",
-    "hash": "0455e87c8abba36d"
-  }
-  {
-    "taskId": "util#build",
-<<<<<<< HEAD
-    "hash": "e09943c27ed0a75d"
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "98d1cf4886bbc73d"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "41b033e352a43533"
   }
 
 Change my-app#build dependsOn
   $ cp "$TESTDIR/fixture-configs/c-my-app-depends-on.json" "$(pwd)/turbo.json" && git commit -am "no comment" --quiet
   $ ${TURBO} build --dry=json | jq -r '.tasks | sort_by(.taskId)[] | {taskId, hash}'
   {
     "taskId": "another#build",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "1d62465edaa86a4e"
-  }
-  {
-    "taskId": "my-app#build",
-    "hash": "ccf2441853eb8930"
-  }
-  {
-    "taskId": "util#build",
-    "hash": "d30fc4474534c30e"
-=======
-    "hash": "39902e236d45b17a"
-=======
-    "hash": "843536e46620dad2"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "78b732d9478d9b83"
   }
   {
     "taskId": "my-app#build",
-    "hash": "8d584a4d18836787"
+    "hash": "d71bf2777e3824b7"
   }
   {
     "taskId": "util#build",
-<<<<<<< HEAD
-    "hash": "e09943c27ed0a75d"
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "98d1cf4886bbc73d"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "41b033e352a43533"
   }
 
 Non-materially modifying the dep graph does nothing.
   $ cp "$TESTDIR/fixture-configs/d-depends-on-util.json" "$(pwd)/turbo.json" && git commit -am "no comment" --quiet
   $ ${TURBO} build --dry=json | jq -r '.tasks | sort_by(.taskId)[] | {taskId, hash}'
   {
     "taskId": "another#build",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "1d62465edaa86a4e"
+    "hash": "78b732d9478d9b83"
   }
   {
     "taskId": "my-app#build",
-    "hash": "ccf2441853eb8930"
+    "hash": "d71bf2777e3824b7"
   }
   {
     "taskId": "util#build",
-    "hash": "d30fc4474534c30e"
-=======
-    "hash": "39902e236d45b17a"
-=======
-    "hash": "843536e46620dad2"
->>>>>>> 37c3c596f1 (chore: update integration tests)
-  }
-  {
-    "taskId": "my-app#build",
-    "hash": "8d584a4d18836787"
-  }
-  {
-    "taskId": "util#build",
-<<<<<<< HEAD
-    "hash": "e09943c27ed0a75d"
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "98d1cf4886bbc73d"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "41b033e352a43533"
   }
 
 
@@ -151,33 +71,13 @@ Change util#build impacts itself and my-app
   $ ${TURBO} build --dry=json | jq -r '.tasks | sort_by(.taskId)[] | {taskId, hash}'
   {
     "taskId": "another#build",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "hash": "1d62465edaa86a4e"
-  }
-  {
-    "taskId": "my-app#build",
-    "hash": "71c6f7392eeebdc1"
-  }
-  {
-    "taskId": "util#build",
-    "hash": "73e9903a46832238"
-=======
-    "hash": "39902e236d45b17a"
-=======
-    "hash": "843536e46620dad2"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "78b732d9478d9b83"
   }
   {
     "taskId": "my-app#build",
-    "hash": "239ff972999c4203"
+    "hash": "550479ca3246010d"
   }
   {
     "taskId": "util#build",
-<<<<<<< HEAD
-    "hash": "b781fbdbf3ba6a42"
->>>>>>> 2eae5cbd82 (Update tests)
-=======
-    "hash": "70eb762a20d17252"
->>>>>>> 37c3c596f1 (chore: update integration tests)
+    "hash": "d29ee2ca954217ef"
   }