feat: auto-config for classic react runtime for internal code

cmux · Feb 9, 2021 · 6b441aa · 6b441aa
1 parent 8d3d34b
commit 6b441aa
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 11 deletions.
diff --git a/packages/koot-webpack/loaders/babel/index.js b/packages/koot-webpack/loaders/babel/index.js
@@ -58,6 +58,18 @@ const testPluginName = (pluginObject, regExp) => {
     );
 };
 
+/** 检查是否存在某个特定的 preset */
+const hasPreset = (presets, regex) =>
+    presets.some((preset) => regex.test(preset.file.request));
+
+const reactHotLoaderClientBlacklist = [
+    'koot/React/component-extender.jsx',
+    'koot/React/hoc/dev-hot.jsx',
+    'koot/ReactApp/client/index.jsx',
+    'koot/ReactApp/server/ssr.jsx',
+    'koot/ReactSPA/client/run.jsx',
+];
+
 // ============================================================================
 
 /** _Koot.js_ 所在路径 */
@@ -108,7 +120,7 @@ module.exports = require('babel-loader').custom((babel) => {
             //     return cfg.options;
             // }
 
-            let { __typescript = false } = customOptions;
+            const { __typescript: __typescript__ = false } = customOptions;
             const {
                 __createDll,
                 __react,
@@ -117,13 +129,8 @@ module.exports = require('babel-loader').custom((babel) => {
                 __routes,
                 __i18n,
             } = customOptions;
-            const {
-                presets,
-                plugins,
-                filename,
-                root,
-                ...options
-            } = cfg.options;
+            const { presets, plugins, ...options } = cfg.options;
+            const { filename } = options;
             const isServer =
                 __server || process.env.WEBPACK_BUILD_STAGE === 'server';
             const isKootModule = !/^\.\./.test(
@@ -134,11 +141,15 @@ module.exports = require('babel-loader').custom((babel) => {
 
             // make sure some settings correct ================================
             // if (!__react) __react = /\.(jsx|tsx)$/.test(filename);
-            if (!__typescript) __typescript = /\.(ts|tsx)$/.test(filename);
+            // const __typescript = __typescript__ || /\.(ts|tsx)$/.test(filename);
+            const __typescript = __typescript__ || /\.(ts|tsx)$/.test(filename);
 
             // presets ========================================================
             const newPresets = [...presets];
-            if (__typescript) {
+            if (
+                __typescript &&
+                !hasPreset(newPresets, /@babel\/preset-typescript/)
+            ) {
                 newPresets.unshift([
                     require('@babel/preset-typescript').default,
                     __react
@@ -259,6 +270,7 @@ module.exports = require('babel-loader').custom((babel) => {
             if (
                 !__createDll &&
                 __react &&
+                !isKootModule &&
                 process.env.WEBPACK_BUILD_ENV === 'dev'
             ) {
                 // newPlugins.push(require('extract-hoc/babel'));

diff --git a/packages/koot-webpack/loaders/babel/transform-fix-default-export.js b/packages/koot-webpack/loaders/babel/transform-fix-default-export.js
@@ -4,7 +4,7 @@
  *
  * Here's a hacky fix
  */
-module.exports = function(source) {
+module.exports = function (source) {
     const expExportDefault = `export default _default`;
     source = source.replace(
         /(var _default = .+?;\n*)(;\n\n\(function \(\) \{\n[ ]*var reactHotLoader = )/gm,

diff --git a/packages/koot-webpack/loaders/react-hot/index.js b/packages/koot-webpack/loaders/react-hot/index.js
@@ -12,6 +12,8 @@ function AddReactHotLoader(source) {
     if (!__react) return source;
     if (!source || !/^\s*export\s+default/m.exec(source)) return source;
     if (/(\/|\\|^)root\.jsx$/.test(this.resourcePath)) return source;
+    if (/\/\*\s+__KOOT_DEV_NO_REACT_HOT_INJECT__\s+\*\//g.test(source))
+        return source;
 
     let theSource = getImportLine() + source;
 

diff --git a/packages/koot/React/component-extender.jsx b/packages/koot/React/component-extender.jsx
@@ -1,3 +1,4 @@
+/* __KOOT_DEV_NO_REACT_HOT_INJECT__ */
 import { Component, forwardRef } from 'react';
 import { connect } from 'react-redux';
 // import { hot } from 'react-hot-loader'

diff --git a/packages/koot/React/hoc/dev-hot.jsx b/packages/koot/React/hoc/dev-hot.jsx
@@ -1,3 +1,4 @@
+/* __KOOT_DEV_NO_REACT_HOT_INJECT__ */
 import { hot } from 'react-hot-loader';
 import { forwardRef } from 'react';
 

diff --git a/packages/koot/ReactApp/client/index.jsx b/packages/koot/ReactApp/client/index.jsx
@@ -1,3 +1,4 @@
+/* __KOOT_DEV_NO_REACT_HOT_INJECT__ */
 import * as fullConfig from '__KOOT_PROJECT_CONFIG_PORTION_OTHER_CLIENT_PATHNAME__';
 
 import { hydrate } from 'react-dom';

diff --git a/packages/koot/ReactApp/server/ssr.jsx b/packages/koot/ReactApp/server/ssr.jsx
@@ -1,3 +1,4 @@
+/* __KOOT_DEV_NO_REACT_HOT_INJECT__ */
 // import 'regenerator-runtime/runtime';
 import { renderToString } from 'react-dom/server';
 import { match, useRouterHistory as doUseRouterHistory } from 'react-router';

diff --git a/packages/koot/ReactSPA/client/run.jsx b/packages/koot/ReactSPA/client/run.jsx
@@ -1,3 +1,4 @@
+/* __KOOT_DEV_NO_REACT_HOT_INJECT__ */
 import ReactDOM from 'react-dom';
 import history from '../../React/history';