Skip to content

Commit 2cb544d

Browse files
committed
fix: remove circular deps from hot-loader
1 parent 4310fa8 commit 2cb544d

File tree

3 files changed

+124
-128
lines changed

3 files changed

+124
-128
lines changed

src/babel.dev.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ function plugin(args, options = {}) {
4040

4141
const headerTemplate = template(
4242
`(function () {
43-
var enterModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).enterModule;
43+
var enterModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined);
4444
enterModule && enterModule(module);
4545
}())`,
4646
templateOptions,
4747
);
4848
const footerTemplate = template(
4949
`(function () {
50-
var leaveModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).leaveModule;
50+
var leaveModule = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined);
5151
leaveModule && leaveModule(module);
5252
}())`,
5353
templateOptions,
@@ -61,7 +61,7 @@ function plugin(args, options = {}) {
6161
`
6262
(function () {
6363
64-
var reactHotLoader = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : require('react-hot-loader')).default;
64+
var reactHotLoader = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined);
6565
6666
if (!reactHotLoader) {
6767
return;

src/webpack/webpackTagCommonJSExports.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
void (function register() {
55
// eslint-disable-line no-extra-semi
66
/* react-hot-loader/webpack */
7-
var safe_require = function() {
8-
return typeof require === 'undefined' ? undefined : require('react-hot-loader');
9-
};
10-
11-
var reactHotLoader = (typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal : safe_require()).default;
7+
var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
128

139
if (!reactHotLoader) {
1410
return;

0 commit comments

Comments
 (0)