Remove installGlobals

brophdawg11 · brophdawg11 · commit 1dab2d1497e8 · 2024-10-21T15:34:44.000-04:00
diff --git a/integration/helpers/create-fixture.ts b/integration/helpers/create-fixture.ts
@@ -15,7 +15,6 @@ import {
   UNSAFE_decodeViaTurboStream as decodeViaTurboStream,
 } from "react-router";
 import { createRequestHandler as createExpressHandler } from "@react-router/express";
-import { installGlobals } from "@react-router/node";
 
 import { viteConfig } from "./vite.js";
 
@@ -43,8 +42,6 @@ export function json(value: JsonObject) {
 }
 
 export async function createFixture(init: FixtureInit, mode?: ServerMode) {
-  installGlobals();
-
   let projectDir = await createFixtureProject(init, mode);
   let buildPath = url.pathToFileURL(
     path.join(projectDir, "build/server/index.js")
diff --git a/integration/helpers/vite.ts b/integration/helpers/vite.ts
@@ -69,11 +69,8 @@ export const EXPRESS_SERVER = (args: {
 }) =>
   String.raw`
     import { createRequestHandler } from "@react-router/express";
-    import { installGlobals } from "@react-router/node";
     import express from "express";
 
-    installGlobals();
-
     let viteDevServer =
       process.env.NODE_ENV === "production"
         ? undefined
diff --git a/integration/vite-basename-test.ts b/integration/vite-basename-test.ts
@@ -95,9 +95,7 @@ const customServerFile = ({
 
   return js`
     import { createRequestHandler } from "@react-router/express";
-    import { installGlobals } from "@react-router/node";
     import express from "express";
-    installGlobals();
 
     const viteDevServer =
       process.env.NODE_ENV === "production"
@@ -488,9 +486,7 @@ test.describe("Vite base / React Router basename / express build", async () => {
       // Slim server that only serves basename (route) requests from the React Router handler
       "server.mjs": String.raw`
         import { createRequestHandler } from "@react-router/express";
-        import { installGlobals } from "@react-router/node";
         import express from "express";
-        installGlobals();
 
         const app = express();
         app.all(
diff --git a/jest/jest.config.shared.js b/jest/jest.config.shared.js
@@ -19,7 +19,6 @@ module.exports = {
     ),
   },
   modulePathIgnorePatterns: ignorePatterns,
-  setupFiles: ["<rootDir>/__tests__/setup.ts"],
   testMatch: ["<rootDir>/**/*-test.[jt]s?(x)"],
   transform: {
     "\\.[jt]sx?$": require.resolve("./transform"),
diff --git a/packages/react-router-architect/__tests__/setup.ts b/packages/react-router-architect/__tests__/setup.ts
diff --git a/packages/react-router-express/__tests__/setup.ts b/packages/react-router-express/__tests__/setup.ts
diff --git a/packages/react-router-node/__tests__/setup.ts b/packages/react-router-node/__tests__/setup.ts
diff --git a/packages/react-router-node/globals.ts b/packages/react-router-node/globals.ts
diff --git a/packages/react-router-node/index.ts b/packages/react-router-node/index.ts
@@ -1,5 +1,3 @@
-export { installGlobals } from "./globals";
-
 export { createFileSessionStorage } from "./sessions/fileStorage";
 
 export {
diff --git a/packages/react-router-node/install.ts b/packages/react-router-node/install.ts
diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json
@@ -18,10 +18,6 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./install": {
-      "types": "./dist/install.d.ts",
-      "default": "./dist/install.js"
-    },
     "./package.json": "./package.json"
   },
   "sideEffects": [
diff --git a/packages/react-router-node/rollup.config.js b/packages/react-router-node/rollup.config.js
@@ -21,11 +21,9 @@ module.exports = function rollup() {
     "react-router-node"
   );
 
-  const input = [`${SOURCE_DIR}/index.ts`, `${SOURCE_DIR}/install.ts`];
-
   return [
     {
-      input,
+      input: `${SOURCE_DIR}/index.ts`,
       external: (id) => isBareModuleId(id),
       output: {
         banner: createBanner(name, version),
diff --git a/packages/react-router-serve/cli.ts b/packages/react-router-serve/cli.ts
@@ -1,10 +1,8 @@
-import "@react-router/node/install";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import url from "node:url";
 import type { ServerBuild } from "react-router";
-import { installGlobals } from "@react-router/node";
 import { createRequestHandler } from "@react-router/express";
 import compression from "compression";
 import express from "express";
@@ -30,7 +28,6 @@ sourceMapSupport.install({
     return null;
   },
 });
-installGlobals();
 
 run();
 
diff --git a/packages/react-router/jest.config.js b/packages/react-router/jest.config.js
@@ -1,6 +1,7 @@
 /** @type {import('jest').Config} */
 module.exports = {
   ...require("../../jest/jest.config.shared"),
+  setupFiles: ["<rootDir>/__tests__/setup.ts"],
   setupFilesAfterEnv: ["@testing-library/jest-dom"],
   testEnvironment: "jsdom",
 };
diff --git a/playground/compiler-express/server.js b/playground/compiler-express/server.js
@@ -1,11 +1,8 @@
 import { createRequestHandler } from "@react-router/express";
-import { installGlobals } from "@react-router/node";
 import compression from "compression";
 import express from "express";
 import morgan from "morgan";
 
-installGlobals();
-
 const viteDevServer =
   process.env.NODE_ENV === "production"
     ? undefined
diff --git a/playground/compiler/vite.config.ts b/playground/compiler/vite.config.ts
@@ -1,10 +1,7 @@
 import { reactRouter } from "@react-router/dev/vite";
-import { installGlobals } from "@react-router/node";
 import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 
-installGlobals();
-
 export default defineConfig({
   plugins: [reactRouter(), tsconfigPaths()],
 });

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-export { installGlobals } from "./globals";`
`2`		`-`
`3`	`1`	`export { createFileSessionStorage } from "./sessions/fileStorage";`
`4`	`2`
`5`	`3`	`export {`