chore: update

Author: Timeless0911

loader/index.js

@@ -12,7 +12,7 @@ const {
   getModuleSystem,
   getRefreshModuleRuntime,
   normalizeOptions,
-  RefreshGlobals,
+  webpackGlobal,
 } = require('./utils');
 const schema = require('./options.json');
 
@@ -46,11 +46,11 @@ function ReactRefreshLoader(source, inputSourceMap, meta) {
 
   const RefreshSetupRuntimes = {
     cjs: Template.asString(
-      `${RefreshGlobals}.$Refresh$.runtime = require('${RefreshRuntimePath}');`
+      `${webpackGlobal}.$Refresh$.runtime = require('${RefreshRuntimePath}');`
     ),
     esm: Template.asString([
       `import * as __react_refresh_runtime__ from '${RefreshRuntimePath}';`,
-      `${RefreshGlobals}.$Refresh$.runtime = __react_refresh_runtime__;`,
+      `${webpackGlobal}.$Refresh$.runtime = __react_refresh_runtime__;`,
     ]),
   };
 
@@ -68,7 +68,6 @@ function ReactRefreshLoader(source, inputSourceMap, meta) {
     const RefreshModuleRuntime = getRefreshModuleRuntime(Template, {
       const: options.const,
       moduleSystem,
-      refreshGlobals: RefreshGlobals,
     });
 
     if (this.sourceMap) {

loader/utils/getRefreshModuleRuntime.js

@@ -1,8 +1,9 @@
+const webpackGlobal = require('./webpackGlobal');
+
 /**
  * @typedef ModuleRuntimeOptions {Object}
  * @property {boolean} const Use ES6 `const` and `let` in generated runtime code.
  * @property {'cjs' | 'esm'} moduleSystem The module system to be used.
- * @property {string} refreshGlobals The global runtime function where React Refresh runtime is injected.
  */
 
 /**
@@ -21,9 +22,8 @@ function getRefreshModuleRuntime(Template, options) {
   const constDeclaration = options.const ? 'const' : 'var';
   const letDeclaration = options.const ? 'let' : 'var';
   const webpackHot = options.moduleSystem === 'esm' ? 'import.meta.webpackHot' : 'module.hot';
-  const refreshGlobals = options.refreshGlobals;
   return Template.asString([
-    `${constDeclaration} $ReactRefreshModuleId$ = ${refreshGlobals}.$Refresh$.moduleId;`,
+    `${constDeclaration} $ReactRefreshModuleId$ = ${webpackGlobal}.$Refresh$.moduleId;`,
     `${constDeclaration} $ReactRefreshCurrentExports$ = __react_refresh_utils__.getModuleExports(`,
     Template.indent('$ReactRefreshModuleId$'),
     ');',

loader/utils/index.js

@@ -2,12 +2,12 @@ const getIdentitySourceMap = require('./getIdentitySourceMap');
 const getModuleSystem = require('./getModuleSystem');
 const getRefreshModuleRuntime = require('./getRefreshModuleRuntime');
 const normalizeOptions = require('./normalizeOptions');
-const RefreshGlobals = require('./RefreshGlobals');
+const webpackGlobal = require('./webpackGlobal');
 
 module.exports = {
   getIdentitySourceMap,
   getModuleSystem,
   getRefreshModuleRuntime,
   normalizeOptions,
-  RefreshGlobals,
+  webpackGlobal,
 };

loader/utils/RefreshGlobals.js loader/utils/webpackGlobal.jsloader/utils/RefreshGlobals.js renamed to loader/utils/webpackGlobal.js

@@ -1,5 +1,5 @@
 // When available, use `__webpack_global__` which is a stable runtime function to use `__webpack_require__` in this compilation
 // See: https://github.com/webpack/webpack/issues/20139
-const RefreshGlobals = `(typeof __webpack_global__ !== 'undefined' ? __webpack_global__ : __webpack_require__)`;
+const webpackGlobal = `(typeof __webpack_global__ !== 'undefined' ? __webpack_global__ : __webpack_require__)`;
 
-module.exports = RefreshGlobals;
+module.exports = webpackGlobal;

test/loader/unit/getRefreshModuleRuntime.test.js

@@ -1,15 +1,11 @@
 const { Template } = require('webpack');
-const {
-  getRefreshModuleRuntime,
-  RefreshGlobals: refreshGlobals,
-} = require('../../../loader/utils');
+const { getRefreshModuleRuntime } = require('../../../loader/utils');
 
 describe('getRefreshModuleRuntime', () => {
   it('should return working refresh module runtime without const using CommonJS', () => {
     const refreshModuleRuntime = getRefreshModuleRuntime(Template, {
       const: false,
       moduleSystem: 'cjs',
-      refreshGlobals,
     });
 
     expect(refreshModuleRuntime.indexOf('var')).not.toBe(-1);
@@ -55,7 +51,6 @@ describe('getRefreshModuleRuntime', () => {
     const refreshModuleRuntime = getRefreshModuleRuntime(Template, {
       const: true,
       moduleSystem: 'cjs',
-      refreshGlobals,
     });
 
     expect(refreshModuleRuntime.indexOf('var')).toBe(-1);
@@ -101,7 +96,6 @@ describe('getRefreshModuleRuntime', () => {
     const refreshModuleRuntime = getRefreshModuleRuntime(Template, {
       const: false,
       moduleSystem: 'esm',
-      refreshGlobals,
     });
 
     expect(refreshModuleRuntime.indexOf('var')).not.toBe(-1);
@@ -147,7 +141,6 @@ describe('getRefreshModuleRuntime', () => {
     const refreshModuleRuntime = getRefreshModuleRuntime(Template, {
       const: true,
       moduleSystem: 'esm',
-      refreshGlobals,
     });
 
     expect(refreshModuleRuntime.indexOf('var')).toBe(-1);