fix: prevent asset conflicts between React and Grid.js versions

Add coexistence checks to all enqueue methods to prevent loading
both React and Grid.js assets simultaneously.

Changes:
- ReactAdmin.php: Only enqueue React assets when ?react=1
- Init.php: Skip Grid.js when React active on admin pages
- Form.php, Coupon.php, Access.php: Restore classic assets when ?react=0
- Customer.php, Product.php, License.php: Add coexistence checks

Now the toggle between Classic and React versions works correctly.

Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
dwindown
2026-04-18 17:02:14 +07:00
parent bd9cdac02e
commit e8fbfb14c1
74973 changed files with 6658406 additions and 71 deletions

View File

@@ -0,0 +1,53 @@
/*
MIT License http://www.opensource.org/licenses/mit-license.php
Author Haijie Xie @hai-x
*/
"use strict";
const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
/** @typedef {import("../ModuleGraph")} ModuleGraph */
/** @typedef {import("../Module")} Module */
/** @typedef {Set<Module>} Modules */
/**
* Gets outgoing async modules.
* @param {ModuleGraph} moduleGraph module graph
* @param {Module} module module
* @returns {Modules} set of modules
*/
const getOutgoingAsyncModules = (moduleGraph, module) => {
/** @type {Modules} */
const set = new Set();
/** @type {Modules} */
const seen = new Set();
(function g(module) {
if (!moduleGraph.isAsync(module) || seen.has(module)) return;
seen.add(module);
if (module.buildMeta && module.buildMeta.async) {
set.add(module);
} else {
const outgoingConnectionMap =
moduleGraph.getOutgoingConnectionsByModule(module);
if (outgoingConnectionMap) {
for (const [module, connections] of outgoingConnectionMap) {
if (
connections.some(
(c) =>
c.dependency instanceof HarmonyImportDependency &&
c.isTargetActive(undefined)
) &&
module
) {
g(module);
}
}
}
}
})(module);
return set;
};
module.exports.getOutgoingAsyncModules = getOutgoingAsyncModules;

View File

@@ -0,0 +1,94 @@
/*
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
"use strict";
const InitFragment = require("../InitFragment");
const RuntimeGlobals = require("../RuntimeGlobals");
const Template = require("../Template");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("../Generator").GenerateContext} GenerateContext */
/** @typedef {Map<string, string>} Dependencies */
/**
* Represents AwaitDependenciesInitFragment.
* @extends {InitFragment<GenerateContext>}
*/
class AwaitDependenciesInitFragment extends InitFragment {
/**
* Creates an instance of AwaitDependenciesInitFragment.
* @param {Dependencies} dependencies maps an import var to an async module that needs to be awaited
*/
constructor(dependencies) {
super(
undefined,
InitFragment.STAGE_ASYNC_DEPENDENCIES,
0,
"await-dependencies"
);
/** @type {Dependencies} */
this.dependencies = dependencies;
}
/**
* Merges another await-dependencies fragment into this fragment.
* @param {AwaitDependenciesInitFragment} other other AwaitDependenciesInitFragment
* @returns {AwaitDependenciesInitFragment} AwaitDependenciesInitFragment
*/
merge(other) {
const dependencies = new Map(other.dependencies);
for (const [key, value] of this.dependencies) {
dependencies.set(key, value);
}
return new AwaitDependenciesInitFragment(dependencies);
}
/**
* Returns the source code that will be included as initialization code.
* @param {GenerateContext} context context
* @returns {string | Source | undefined} the source code that will be included as initialization code
*/
getContent({ runtimeRequirements, runtimeTemplate }) {
runtimeRequirements.add(RuntimeGlobals.module);
if (this.dependencies.size === 0) {
return "";
}
const importVars = [...this.dependencies.keys()];
const asyncModuleValues = [...this.dependencies.values()].join(", ");
const templateInput = [
`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${asyncModuleValues}]);`
];
if (
this.dependencies.size === 1 ||
!runtimeTemplate.supportsDestructuring()
) {
templateInput.push(
"var __webpack_async_dependencies_result__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);"
);
for (const [index, importVar] of importVars.entries()) {
templateInput.push(
`${importVar} = __webpack_async_dependencies_result__[${index}];`
);
}
} else {
const importVarsStr = importVars.join(", ");
templateInput.push(
`([${importVarsStr}] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);`
);
}
templateInput.push("");
return Template.asString(templateInput);
}
}
module.exports = AwaitDependenciesInitFragment;

View File

@@ -0,0 +1,54 @@
/*
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
"use strict";
const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
/** @typedef {import("../Compiler")} Compiler */
/** @typedef {import("../Module")} Module */
const PLUGIN_NAME = "InferAsyncModulesPlugin";
class InferAsyncModulesPlugin {
/**
* Applies the plugin by registering its hooks on the compiler.
* @param {Compiler} compiler the compiler instance
* @returns {void}
*/
apply(compiler) {
compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
const { moduleGraph } = compilation;
compilation.hooks.finishModules.tap(PLUGIN_NAME, (modules) => {
/** @type {Set<Module>} */
const queue = new Set();
for (const module of modules) {
if (module.buildMeta && module.buildMeta.async) {
queue.add(module);
}
}
for (const module of queue) {
moduleGraph.setAsync(module);
for (const [
originModule,
connections
] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
if (
connections.some(
(c) =>
c.dependency instanceof HarmonyImportDependency &&
c.isTargetActive(undefined)
)
) {
queue.add(/** @type {Module} */ (originModule));
}
}
}
});
});
}
}
module.exports = InferAsyncModulesPlugin;