Align remixBabelConfig and noForceEmit across packages

remix-run · Oct 16, 2024 · 421d5cd · 421d5cd
1 parent 5d05ee8
commit 421d5cd
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/packages/react-router-architect/rollup.config.js b/packages/react-router-architect/rollup.config.js
@@ -10,6 +10,7 @@ const {
   getBuildDirectories,
   createBanner,
   WATCH,
+  remixBabelConfig,
 } = require("../../rollup.utils");
 const { name: packageName, version } = require("./package.json");
 
@@ -23,9 +24,7 @@ module.exports = function rollup() {
 
   return [
     {
-      external(id) {
-        return isBareModuleId(id);
-      },
+      external: (id) => isBareModuleId(id),
       input: `${SOURCE_DIR}/index.ts`,
       output: {
         banner: createBanner(packageName, version),
@@ -39,11 +38,13 @@ module.exports = function rollup() {
           babelHelpers: "bundled",
           exclude: /node_modules/,
           extensions: [".ts"],
+          ...remixBabelConfig,
         }),
         typescript({
           tsconfig: path.join(__dirname, "tsconfig.json"),
           exclude: ["__tests__"],
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
         nodeResolve({ extensions: [".ts"] }),
         copy({

diff --git a/packages/react-router-cloudflare/rollup.config.js b/packages/react-router-cloudflare/rollup.config.js
@@ -24,9 +24,7 @@ module.exports = function rollup() {
 
   return [
     {
-      external(id) {
-        return isBareModuleId(id);
-      },
+      external: (id) => isBareModuleId(id),
       input: `${SOURCE_DIR}/index.ts`,
       output: {
         banner: createBanner(packageName, version),
@@ -45,6 +43,7 @@ module.exports = function rollup() {
         typescript({
           tsconfig: path.join(__dirname, "tsconfig.json"),
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
         nodeResolve({ extensions: [".ts"] }),
         copy({

diff --git a/packages/react-router-express/rollup.config.js b/packages/react-router-express/rollup.config.js
@@ -43,6 +43,7 @@ module.exports = function rollup() {
           tsconfig: path.join(__dirname, "tsconfig.json"),
           exclude: ["__tests__"],
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
         nodeResolve({ extensions: [".ts", ".tsx"] }),
         copy({

diff --git a/packages/react-router-fs-routes/rollup.config.js b/packages/react-router-fs-routes/rollup.config.js
@@ -9,6 +9,7 @@ const {
   createBanner,
   getBuildDirectories,
   WATCH,
+  remixBabelConfig,
 } = require("../../rollup.utils");
 const { name, version } = require("./package.json");
 
@@ -36,11 +37,13 @@ module.exports = function rollup() {
           babelHelpers: "bundled",
           exclude: /node_modules/,
           extensions: [".ts"],
+          ...remixBabelConfig,
         }),
         typescript({
           tsconfig: path.join(__dirname, "tsconfig.json"),
           exclude: ["__tests__"],
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
         nodeResolve({ extensions: [".ts"] }),
         copy({

diff --git a/packages/react-router-remix-config-routes-adapter/rollup.config.js b/packages/react-router-remix-config-routes-adapter/rollup.config.js
@@ -9,6 +9,7 @@ const {
   createBanner,
   getBuildDirectories,
   WATCH,
+  remixBabelConfig,
 } = require("../../rollup.utils");
 const { name, version } = require("./package.json");
 
@@ -36,11 +37,13 @@ module.exports = function rollup() {
           babelHelpers: "bundled",
           exclude: /node_modules/,
           extensions: [".ts"],
+          ...remixBabelConfig,
         }),
         typescript({
           tsconfig: path.join(__dirname, "tsconfig.json"),
           exclude: ["__tests__"],
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
         nodeResolve({ extensions: [".ts"] }),
         copy({

diff --git a/packages/react-router-serve/rollup.config.js b/packages/react-router-serve/rollup.config.js
@@ -42,6 +42,7 @@ module.exports = function rollup() {
           tsconfig: path.join(__dirname, "tsconfig.json"),
           exclude: ["__tests__"],
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
         nodeResolve({ extensions: [".ts"] }),
         copy({

diff --git a/packages/react-router/rollup.config.js b/packages/react-router/rollup.config.js
@@ -91,6 +91,7 @@ module.exports = function rollup() {
           // eslint-disable-next-line no-restricted-globals
           tsconfig: path.join(__dirname, "tsconfig.dom.json"),
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
       ].concat(PRETTY ? prettier({ parser: "babel" }) : []),
     },
@@ -122,6 +123,7 @@ module.exports = function rollup() {
           // eslint-disable-next-line no-restricted-globals
           tsconfig: path.join(__dirname, "tsconfig.dom.json"),
           noEmitOnError: !WATCH,
+          noForceEmit: true,
         }),
       ],
     },

diff --git a/rollup.utils.js b/rollup.utils.js
@@ -150,15 +150,6 @@ const remixBabelConfig = {
   plugins: [
     "@babel/plugin-proposal-export-namespace-from",
     "@babel/plugin-proposal-optional-chaining",
-    // Strip console.debug calls unless REACT_ROUTER_DEBUG=true
-    ...(process.env.REACT_ROUTER_DEBUG === "true"
-      ? []
-      : [
-          [
-            "transform-remove-console",
-            { exclude: ["error", "warn", "log", "info"] },
-          ],
-        ]),
   ],
 };