Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support nested __webpack_exports__ #6930

Merged
merged 1 commit into from
Jun 26, 2024
Merged

feat: support nested __webpack_exports__ #6930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions crates/rspack_plugin_javascript/src/parser_plugin/compatibility_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,31 @@ impl JavascriptParserPlugin for CompatibilityPlugin {
None
}

fn pattern(
&self,
parser: &mut JavascriptParser,
ident: &swc_core::ecma::ast::Ident,
for_name: &str,
) -> Option<bool> {
if for_name == RuntimeGlobals::EXPORTS.name() {
parser.tag_variable(
ident.sym.to_string(),
NESTED_WEBPACK_IDENTIFIER_TAG,
Some(NestedRequireData {
name: "__nested_webpack_exports__".to_string(),
update: false,
loc: DependencyLocation::new(
ident.span().real_lo(),
ident.span().real_hi(),
Some(parser.source_map.clone()),
),
}),
);
return Some(true);
}
None
}

fn pre_statement(
&self,
parser: &mut JavascriptParser,
Expand Down Expand Up @@ -111,10 +136,6 @@ impl JavascriptParserPlugin for CompatibilityPlugin {
if for_name != NESTED_WEBPACK_IDENTIFIER_TAG {
return None;
}
let name = ident.sym.as_str();
if name != RuntimeGlobals::REQUIRE.name() {
return None;
}
let tag_info = parser
.definitions_db
.expect_get_mut_tag_info(&parser.current_tag_info?);
Expand Down
2 changes: 1 addition & 1 deletion webpack-test/configCases/library/1-use-library/test.filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = () => {return "__nested_webpack_exports__"}
module.exports = () => {return "https://github.com/web-infra-dev/rspack/issues/4313"}
5 changes: 5 additions & 0 deletions webpack-test/configCases/output-module/reuse-webpack-esm-library/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { useCall } from "./lib";

it("should compile and run", () => {
expect(useCall()).toBe(1);
});
95 changes: 95 additions & 0 deletions webpack-test/configCases/output-module/reuse-webpack-esm-library/lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
/******/ var __webpack_modules__ = ({

/***/ "react":
/*!************************!*\
!*** external "react" ***!
\************************/
/***/ ((module) => {

var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
var y = x => () => x
module.exports = __WEBPACK_EXTERNAL_MODULE_react__;

/***/ })

/******/ });
/************************************************************************/
/******/ // The module cache
/******/ var __webpack_module_cache__ = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/ // Check if module is in cache
/******/ var cachedModule = __webpack_module_cache__[moduleId];
/******/ if (cachedModule !== undefined) {
/******/ return cachedModule.exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = {
/******/ // no module.id needed
/******/ // no module.loaded needed
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/************************************************************************/
/******/ /* webpack/runtime/define property getters */
/******/ (() => {
/******/ // define getter functions for harmony exports
/******/ __webpack_require__.d = (exports, definition) => {
/******/ for(var key in definition) {
/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
/******/ }
/******/ }
/******/ };
/******/ })();
/******/
/******/ /* webpack/runtime/hasOwnProperty shorthand */
/******/ (() => {
/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
/******/ })();
/******/
/******/ /* webpack/runtime/make namespace object */
/******/ (() => {
/******/ // define __esModule on exports
/******/ __webpack_require__.r = (exports) => {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/ })();
/******/
/************************************************************************/
var __webpack_exports__ = {};
// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
(() => {
/*!***************************!*\
!*** ./src/store/call.ts ***!
\***************************/
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ useCall: () => (/* binding */ useCall),
/* harmony export */ withCallManager: () => (/* binding */ withCallManager)
/* harmony export */ });
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "react");

function withCallManager() {
return react__WEBPACK_IMPORTED_MODULE_0__.createElement(1);
}
function useCall() {
return withCallManager();
}
})();

var __webpack_exports__useCall = __webpack_exports__.useCall;
var __webpack_exports__withCallManager = __webpack_exports__.withCallManager;
export { __webpack_exports__useCall as useCall, __webpack_exports__withCallManager as withCallManager };
1 change: 1 addition & 0 deletions webpack-test/configCases/output-module/reuse-webpack-esm-library/react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export function createElement(a) { return a; }
14 changes: 14 additions & 0 deletions webpack-test/configCases/output-module/reuse-webpack-esm-library/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const path = require("path");
/** @type {import("../../../../").Configuration} */
module.exports = {
mode: "development",
devtool: "eval",
optimization: {
concatenateModules: false
},
resolve: {
alias: {
react: path.resolve(__dirname, "react")
}
}
};
Loading