From 2d662ec2a0cc1ff07a24164efeae37748b3417b6 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Tue, 29 Mar 2022 17:38:45 +0800
Subject: [PATCH] fix: remove depercated `global` option in favor of `globals`
 (#970)

---
 docs/guide/index.md                 | 2 +-
 packages/vitest/package.json        | 3 ---
 packages/vitest/src/node/config.ts  | 4 ----
 packages/vitest/src/types/config.ts | 5 -----
 tsconfig.json                       | 1 -
 5 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/docs/guide/index.md b/docs/guide/index.md
index d0c1ed35c24c..4351c88ce16d 100644
--- a/docs/guide/index.md
+++ b/docs/guide/index.md
@@ -111,8 +111,8 @@ You can specify additional CLI options like `--port` or `--https`. For a full li
 | `--outputFile <filename>` | Write test results to a file when the `--reporter=json` or `--reporter=junit` option is also specified |
 | `--coverage` | Use c8 for coverage |
 | `--run` | Do not watch |
+| `--mode` | Override Vite mode (default: `test`) |
 | `--mode <name>` | Override Vite mode (default: `test`) |
-| `--global` | Inject APIs globally `deprecated` use `--globals` |
 | `--globals` | Inject APIs globally |
 | `--dom` | Mock browser api with happy-dom |
 | `--environment <env>` | Runner environment (default: `node`) |
diff --git a/packages/vitest/package.json b/packages/vitest/package.json
index ef74c397027c..c650637a3b4b 100644
--- a/packages/vitest/package.json
+++ b/packages/vitest/package.json
@@ -32,9 +32,6 @@
       "types": "./dist/index.d.ts"
     },
     "./*": "./*",
-    "./global": {
-      "types": "./globals.d.ts"
-    },
     "./globals": {
       "types": "./globals.d.ts"
     },
diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
index 669288626085..1c0d07b4f8d7 100644
--- a/packages/vitest/src/node/config.ts
+++ b/packages/vitest/src/node/config.ts
@@ -78,14 +78,10 @@ export function resolveConfig(
     options.environment = 'happy-dom'
   }
 
-  const globals = options?.global ?? options.globals
-
   const resolved = {
     ...configDefaults,
     ...options,
     root: viteConfig.root,
-    globals,
-    global: globals,
   } as ResolvedConfig
 
   if (viteConfig.base !== '/')
diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index 23ccfabc77ba..b7c884dbf0e4 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -92,11 +92,6 @@ export interface InlineConfig {
   */
   globals?: boolean
 
-  /**
-   * @deprecated
-   */
-  global?: boolean
-
   /**
    * Running environment
    *
diff --git a/tsconfig.json b/tsconfig.json
index 9253948f21a4..5b2dff5306b0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,7 +19,6 @@
       "#types": ["./packages/vitest/src/index.ts"],
       "~/*": ["./packages/ui/client/*"],
       "vitest": ["./packages/vitest/src/index.ts"],
-      "vitest/global": ["./packages/vitest/global.d.ts"],
       "vitest/globals": ["./packages/vitest/globals.d.ts"],
       "vitest/node": ["./packages/vitest/src/node/index.ts"],
       "vitest/config": ["./packages/vitest/src/config.ts"],