Skip to content

Commit d8cd46f

Browse files
chenjiahanchenjiahan
authored
refactor: rename webpack external vars to rspack format (#12249)
1 parent 92f28c7 commit d8cd46f

File tree

143 files changed

+677
-677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+677
-677
lines changed

‎crates/rspack_core/src/compilation/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ impl Compilation {
630630
hash_map::Entry::Vacant(vac) => {
631631
let mut b = itoa::Buffer::new();
632632
let import_var = format!(
633-
"{}__rspack_{}import_{}__",
633+
"{}__rspack_{}import_{}",
634634
to_identifier(user_request),
635635
match phase {
636636
ImportPhase::Evaluation => "",

‎crates/rspack_core/src/external_module.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ impl ExternalModule {
361361
chunk_init_fragments.push(
362362
NormalInitFragment::new(
363363
format!(
364-
"import {{ createRequire as __WEBPACK_EXTERNAL_createRequire }} from \"{}\";\n{} __WEBPACK_EXTERNAL_createRequire_require = __WEBPACK_EXTERNAL_createRequire({}.url);\n",
364+
"import {{ createRequire as __rspack_external_createRequire }} from \"{}\";\n{} __rspack_external_createRequire_require = __rspack_external_createRequire({}.url);\n",
365365
if need_prefix { "node:module" } else { "module" },
366366
if compilation.options.output.environment.supports_const() {
367367
"const"
@@ -386,7 +386,7 @@ impl ExternalModule {
386386
("undefined".to_string(), String::new())
387387
};
388388
format!(
389-
"{} = __WEBPACK_EXTERNAL_createRequire_require({}){};",
389+
"{} = __rspack_external_createRequire_require({}){};",
390390
get_namespace_object_export(concatenation_scope, supports_const),
391391
request,
392392
specifiers
@@ -403,7 +403,7 @@ impl ExternalModule {
403403
let id = ChunkGraph::get_module_id(&compilation.module_ids_artifact, self.identifier())
404404
.map(|s| s.as_str())
405405
.expect("should have module id");
406-
let external_variable = format!("__WEBPACK_EXTERNAL_MODULE_{}__", to_identifier(id));
406+
let external_variable = format!("__rspack_external_{}", to_identifier(id));
407407
let check_external_variable = if module_graph.is_optional(&self.id, module_graph_cache) {
408408
format!(
409409
"if(typeof {} === 'undefined') {{ {} }}\n",
@@ -552,7 +552,7 @@ impl ExternalModule {
552552
chunk_init_fragments.push(
553553
NormalInitFragment::new(
554554
format!(
555-
"import * as __WEBPACK_EXTERNAL_MODULE_{}__ from {}{};\n",
555+
"import * as __rspack_external_{} from {}{};\n",
556556
id.clone(),
557557
json_stringify(request.primary()),
558558
attributes.unwrap_or_default()
@@ -569,7 +569,7 @@ impl ExternalModule {
569569
)
570570
.boxed(),
571571
);
572-
let external_module_id = format!("__WEBPACK_EXTERNAL_MODULE_{id}__");
572+
let external_module_id = format!("__rspack_external_{id}");
573573
let namespace_export_with_name = format!(
574574
"{}{}{}",
575575
NAMESPACE_OBJECT_EXPORT,
@@ -603,7 +603,7 @@ impl ExternalModule {
603603
chunk_init_fragments.push(
604604
NormalInitFragment::new(
605605
format!(
606-
"import * as __WEBPACK_EXTERNAL_MODULE_{}__ from {}{};\n",
606+
"import * as __rspack_external_{} from {}{};\n",
607607
id.clone(),
608608
json_stringify(request.primary()),
609609
attributes.clone().unwrap_or_default()
@@ -620,7 +620,7 @@ impl ExternalModule {
620620
)
621621
.boxed(),
622622
);
623-
let external_module_id = format!("__WEBPACK_EXTERNAL_MODULE_{id}__");
623+
let external_module_id = format!("__rspack_external_{id}");
624624
let namespace_export_with_name = format!(
625625
"{}{}{}",
626626
NAMESPACE_OBJECT_EXPORT,
@@ -651,7 +651,7 @@ impl ExternalModule {
651651
chunk_init_fragments.push(
652652
NormalInitFragment::new(
653653
format!(
654-
"import * as __WEBPACK_EXTERNAL_MODULE_{}__ from {}{};\n",
654+
"import * as __rspack_external_{} from {}{};\n",
655655
id.clone(),
656656
json_stringify(request.primary()),
657657
{
@@ -678,7 +678,7 @@ impl ExternalModule {
678678
);
679679
format!(
680680
r#"
681-
{} = __WEBPACK_EXTERNAL_MODULE_{}__;
681+
{} = __rspack_external_{};
682682
"#,
683683
get_namespace_object_export(concatenation_scope, supports_const),
684684
id.clone()

‎crates/rspack_plugin_javascript/src/parser_plugin/api_plugin.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl JavascriptParserPlugin for APIPlugin {
198198
API_NON_REQUIRE => {
199199
let content = if self.options.module {
200200
parser.build_info.need_create_require = true;
201-
"__WEBPACK_EXTERNAL_createRequire_require".into()
201+
"__rspack_external_createRequire_require".into()
202202
} else {
203203
"require".into()
204204
};

‎crates/rspack_plugin_javascript/src/plugin/api_plugin.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async fn render_module_content(
4545
init_fragments.push(
4646
NormalInitFragment::new(
4747
format!(
48-
"import {{ createRequire as __WEBPACK_EXTERNAL_createRequire }} from \"{}\";\n{} __WEBPACK_EXTERNAL_createRequire_require = __WEBPACK_EXTERNAL_createRequire({}.url);\n",
48+
"import {{ createRequire as __rspack_external_createRequire }} from \"{}\";\n{} __rspack_external_createRequire_require = __rspack_external_createRequire({}.url);\n",
4949
if need_prefix { "node:module" } else { "module" },
5050
if compilation.options.output.environment.supports_const() {
5151
"const"

‎crates/rspack_plugin_library/src/system_library_plugin.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ async fn render(
157157
let mut source = ConcatSource::default();
158158
source.add(RawStringSource::from(format!("System.register({name}{external_deps_array}, function({dynamic_export}, __system_context__) {{\n")));
159159
if !is_has_external_modules {
160-
// var __WEBPACK_EXTERNAL_MODULE_{}__ = {};
160+
// var __rspack_external_{} = {};
161161
source.add(RawStringSource::from(external_var_declarations));
162-
// Object.defineProperty(__WEBPACK_EXTERNAL_MODULE_{}__, "__esModule", { value: true });
162+
// Object.defineProperty(__rspack_external_{}, "__esModule", { value: true });
163163
source.add(RawStringSource::from(external_var_initialization));
164164
}
165165
source.add(RawStringSource::from_static("return {\n"));

‎crates/rspack_plugin_library/src/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn inner_external_arguments(modules: &[&ExternalModule], compilation: &Compilati
2626
.iter()
2727
.map(|m| {
2828
format!(
29-
"__WEBPACK_EXTERNAL_MODULE_{}__",
29+
"__rspack_external_{}",
3030
to_identifier(
3131
ChunkGraph::get_module_id(&compilation.module_ids_artifact, m.identifier())
3232
.map(|s| s.as_str())

‎tests/rspack-test/builtinCases/plugin-asset/asset-advanced/__snapshots__/output.snap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["main"], {
44
"./index.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
55
__webpack_require__.r(__webpack_exports__);
6-
/* import */var _images_file_svg__rspack_import_0__ = __webpack_require__("./images/file.svg");
6+
/* import */var _images_file_svg__rspack_import_0 = __webpack_require__("./images/file.svg");
77

88

99
const container = document.createElement("div");
@@ -29,7 +29,7 @@ function createImageElement(title, src) {
2929
container.appendChild(div);
3030
}
3131

32-
[_images_file_svg__rspack_import_0__].forEach(src => {
32+
[_images_file_svg__rspack_import_0].forEach(src => {
3333
createImageElement(src.split(".").pop(), src);
3434
});
3535

‎tests/rspack-test/builtinCases/plugin-asset/asset-simple/__snapshots__/output.snap.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["main"], {
44
"./index.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
55
__webpack_require__.r(__webpack_exports__);
6-
/* import */var _images_file_png__rspack_import_0__ = __webpack_require__("./images/file.png");
7-
/* import */var _images_file_jpg__rspack_import_1__ = __webpack_require__("./images/file.jpg");
8-
/* import */var _images_file_svg__rspack_import_2__ = __webpack_require__("./images/file.svg");
6+
/* import */var _images_file_png__rspack_import_0 = __webpack_require__("./images/file.png");
7+
/* import */var _images_file_jpg__rspack_import_1 = __webpack_require__("./images/file.jpg");
8+
/* import */var _images_file_svg__rspack_import_2 = __webpack_require__("./images/file.svg");
99

1010

1111

@@ -33,7 +33,7 @@ function createImageElement(title, src) {
3333
container.appendChild(div);
3434
}
3535

36-
[_images_file_png__rspack_import_0__, _images_file_jpg__rspack_import_1__, _images_file_svg__rspack_import_2__].forEach(src => {
36+
[_images_file_png__rspack_import_0, _images_file_jpg__rspack_import_1, _images_file_svg__rspack_import_2].forEach(src => {
3737
createImageElement(src.split(".").pop(), src);
3838
});
3939

‎tests/rspack-test/builtinCases/plugin-asset/asset-source/__snapshots__/output.snap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["main"], {
44
"./index.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
55
__webpack_require__.r(__webpack_exports__);
6-
/* import */var _data_txt__rspack_import_0__ = __webpack_require__("./data.txt");
6+
/* import */var _data_txt__rspack_import_0 = __webpack_require__("./data.txt");
77

88

9-
console.log(_data_txt__rspack_import_0__);
9+
console.log(_data_txt__rspack_import_0);
1010

1111

1212
}),

‎tests/rspack-test/builtinCases/plugin-css-modules/modules-composes/__snapshots__/output.snap.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["main"], {
4949
"./index.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
5050
__webpack_require__.r(__webpack_exports__);
51-
/* import */var _style_module_css__rspack_import_0__ = __webpack_require__("./style.module.css");
51+
/* import */var _style_module_css__rspack_import_0 = __webpack_require__("./style.module.css");
5252

5353

5454

0 commit comments

Comments
 (0)