From 99e60c25ef545e63c8bc1e2a829690eb9e9b2630 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 1 Dec 2022 11:11:46 -0500
Subject: [PATCH] Remove ENABLE_REMIX_ROUTER flags

---
 .github/workflows/reusable-test.yml           |  4 ----
 .github/workflows/test.yml                    |  7 -------
 package.json                                  |  1 -
 .../remix-server-runtime/rollup.config.js     | 20 -------------------
 yarn.lock                                     | 10 +---------
 5 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml
index 4b7d94ed607..c2ecbf4dd4e 100644
--- a/.github/workflows/reusable-test.yml
+++ b/.github/workflows/reusable-test.yml
@@ -9,14 +9,10 @@ on:
         # but we want to pass an array (node_version: "[14, 16, 18]"),
         # so we'll need to manually stringify it for now
         type: string
-      enable_remix_router:
-        required: false
-        type: string
 
 env:
   CI: true
   CYPRESS_INSTALL_BINARY: 0
-  ENABLE_REMIX_ROUTER: ${{ inputs.enable_remix_router }}
 
 jobs:
   build:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f278706f98..14905fe4d14 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,10 +23,3 @@ jobs:
     uses: ./.github/workflows/reusable-test.yml
     with:
       node_version: '["latest"]'
-
-  test-experimental:
-    if: github.repository == 'remix-run/remix'
-    uses: ./.github/workflows/reusable-test.yml
-    with:
-      node_version: '["latest"]'
-      enable_remix_router: "1"
diff --git a/package.json b/package.json
index f7dc676e39b..2e3aedc1580 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "@rollup/plugin-babel": "^5.2.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^11.0.1",
-    "@rollup/plugin-replace": "^4.0.0",
     "@testing-library/cypress": "^8.0.2",
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/react": "^13.3.0",
diff --git a/packages/remix-server-runtime/rollup.config.js b/packages/remix-server-runtime/rollup.config.js
index d9def48cfcd..256dfeab6ea 100644
--- a/packages/remix-server-runtime/rollup.config.js
+++ b/packages/remix-server-runtime/rollup.config.js
@@ -3,7 +3,6 @@ const path = require("path");
 const babel = require("@rollup/plugin-babel").default;
 const nodeResolve = require("@rollup/plugin-node-resolve").default;
 const copy = require("rollup-plugin-copy");
-const replace = require("@rollup/plugin-replace");
 
 const {
   getOutputDir,
@@ -14,15 +13,6 @@ const {
 } = require("../../rollup.utils");
 const { name: packageName, version } = require("./package.json");
 
-const ENABLE_REMIX_ROUTER = !!process.env.ENABLE_REMIX_ROUTER;
-
-const replacePlugin = replace({
-  preventAssignment: true,
-  values: {
-    "process.env.ENABLE_REMIX_ROUTER": ENABLE_REMIX_ROUTER ? "1" : "0",
-  },
-});
-
 /** @returns {import("rollup").RollupOptions[]} */
 module.exports = function rollup() {
   let sourceDir = "packages/remix-server-runtime";
@@ -42,12 +32,7 @@ module.exports = function rollup() {
         preserveModules: true,
         exports: "named",
       },
-      treeshake: {
-        // Without this, we don't tree-shake the require('@remix-run/router') :/
-        moduleSideEffects: false,
-      },
       plugins: [
-        replacePlugin,
         babel({
           babelHelpers: "bundled",
           exclude: /node_modules/,
@@ -76,12 +61,7 @@ module.exports = function rollup() {
         format: "esm",
         preserveModules: true,
       },
-      treeshake: {
-        // Without this, we don't tree-shake the require('@remix-run/router') :/
-        moduleSideEffects: false,
-      },
       plugins: [
-        replacePlugin,
         babel({
           babelHelpers: "bundled",
           exclude: /node_modules/,
diff --git a/yarn.lock b/yarn.lock
index 740019db030..9210a0ecabc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2331,14 +2331,6 @@
     is-module "^1.0.0"
     resolve "^1.19.0"
 
-"@rollup/plugin-replace@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz"
-  integrity sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
 "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
   resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"
@@ -8757,7 +8749,7 @@ lz-string@^1.4.4:
   resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz"
   integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=
 
-magic-string@^0.25.3, magic-string@^0.25.7:
+magic-string@^0.25.3:
   version "0.25.9"
   resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
   integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==