Skip to content

Commit

Permalink
Remove ENABLE_REMIX_ROUTER flags (#4732)
Browse files Browse the repository at this point in the history
  • Loading branch information
brophdawg11 authored Dec 6, 2022
1 parent 8171451 commit d5fe33b
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 41 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/reusable-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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",
Expand Down
20 changes: 0 additions & 20 deletions packages/remix-server-runtime/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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";
Expand All @@ -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/,
Expand Down Expand Up @@ -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/,
Expand Down
10 changes: 1 addition & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2143,14 +2143,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"
Expand Down Expand Up @@ -8780,7 +8772,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==
Expand Down

0 comments on commit d5fe33b

Please sign in to comment.