Skip to content

Commit 7d5c56d

Browse files
chenjiahanchenjiahan
authored
refactor: rename webpack imported vars to rspack format (#12245)
* refactor: rename webpack imported vars to rspack format * fix: update tests * fix
1 parent b6ebb41 commit 7d5c56d

File tree

128 files changed

+610
-610
lines changed

Some content is hidden

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

128 files changed

+610
-610
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-
"{}__WEBPACK_{}IMPORTED_MODULE_{}__",
633+
"{}__rspack_{}import_{}__",
634634
to_identifier(user_request),
635635
match phase {
636636
ImportPhase::Evaluation => "",

‎crates/rspack_plugin_wasm/src/parser_and_generator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl ParserAndGenerator for AsyncWasmParserAndGenerator {
192192
let dep_module = dep_modules.entry(mgm.module_identifier).or_insert_with(|| {
193193
let mut len_buffer = itoa::Buffer::new();
194194
let len_str = len_buffer.format(len);
195-
let import_var = format!("WEBPACK_IMPORTED_MODULE_{}", len_str);
195+
let import_var = format!("rspack_import_{}", len_str);
196196
if ModuleGraph::is_async(compilation, &mgm.module_identifier) {
197197
promises.push(import_var.clone());
198198
}

‎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__WEBPACK_IMPORTED_MODULE_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__WEBPACK_IMPORTED_MODULE_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__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./images/file.png");
7-
/* import */var _images_file_jpg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./images/file.jpg");
8-
/* import */var _images_file_svg__WEBPACK_IMPORTED_MODULE_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__WEBPACK_IMPORTED_MODULE_0__, _images_file_jpg__WEBPACK_IMPORTED_MODULE_1__, _images_file_svg__WEBPACK_IMPORTED_MODULE_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__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./data.txt");
6+
/* import */var _data_txt__rspack_import_0__ = __webpack_require__("./data.txt");
77

88

9-
console.log(_data_txt__WEBPACK_IMPORTED_MODULE_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__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./style.module.css");
51+
/* import */var _style_module_css__rspack_import_0__ = __webpack_require__("./style.module.css");
5252

5353

5454

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
(self["webpackChunkwebpack"] = self["webpackChunkwebpack"] || []).push([["main"], {
1111
"./index.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
1212
__webpack_require__.r(__webpack_exports__);
13-
/* import */var _style_module_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./style.module.css");
13+
/* import */var _style_module_css__rspack_import_0__ = __webpack_require__("./style.module.css");
1414

1515

16-
console.log(_style_module_css__WEBPACK_IMPORTED_MODULE_0__);
16+
console.log(_style_module_css__rspack_import_0__);
1717

1818

1919
}),

‎tests/rspack-test/builtinCases/plugin-html/variant/__snapshots__/output.snap.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
```html title=output.html
2-
<!doctype html><html><head><meta charset="UTF-8"><title>Rspack App</title><script crossorigin integrity="sha512-w8/au33WsWLFoT70ascESfiQQq0YK/itM2LuTMEx7WByEYlu+9H8ixpXG/4BuIeadTJpzoOAaweUeWO5mPfCFw==" src="/runtime.js"></script><script crossorigin integrity="sha512-GhsZj/UvOoVJ7Z7T/ypUccygaF2VueTuV6DJGhW9BcnD1+2kWx+5Hz0AnFk+KQQuuzXFk5rmI0ucTtM0QRsLYw==" src="/index.js"></script><link crossorigin href="/index.css" integrity="sha512-vjhejkvTX8D8jzzC5Lc9ToCtcEDb0/NqtYmEHOid+ycq64hvW+JTG7Dw/ACFP6rApgiYwVMbEt6Zfb8j4EoZTA==" rel="stylesheet"></head><body></body></html>
2+
<!doctype html><html><head><meta charset="UTF-8"><title>Rspack App</title><script crossorigin integrity="sha512-w8/au33WsWLFoT70ascESfiQQq0YK/itM2LuTMEx7WByEYlu+9H8ixpXG/4BuIeadTJpzoOAaweUeWO5mPfCFw==" src="/runtime.js"></script><script crossorigin integrity="sha512-JvdroRcUkz+uN5A/vp2y3AFegvf5xvbx6L1K/lzTsn6vUQmQyELi5DJwUcZA1Z75vQ2OvxMg74YAQq7VVeK8QA==" src="/index.js"></script><link crossorigin href="/index.css" integrity="sha512-vjhejkvTX8D8jzzC5Lc9ToCtcEDb0/NqtYmEHOid+ycq64hvW+JTG7Dw/ACFP6rApgiYwVMbEt6Zfb8j4EoZTA==" rel="stylesheet"></head><body></body></html>
33
```

‎tests/rspack-test/builtinCases/plugin-javascript/builtins-define/__snapshots__/output.snap.txt‎

Lines changed: 3 additions & 3 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 _lib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./lib.js");
6+
/* import */var _lib__rspack_import_0__ = __webpack_require__("./lib.js");
77
// import assert from "assert";
88
// import { equal } from "assert";
99

@@ -140,8 +140,8 @@ assert.deepStrictEqual(error_count, 5);
140140
assert.deepStrictEqual(USELESS, { ZERO: 0 });
141141
assert.deepStrictEqual({}.DO_NOT_CONVERTED5, undefined);
142142
assert.deepStrictEqual({}.DO_NOT_CONVERTED6, undefined);
143-
assert.deepStrictEqual(_lib__WEBPACK_IMPORTED_MODULE_0__.DO_NOT_CONVERTED7, 402);
144-
assert.deepStrictEqual(_lib__WEBPACK_IMPORTED_MODULE_0__["default"], 401);
143+
assert.deepStrictEqual(_lib__rspack_import_0__.DO_NOT_CONVERTED7, 402);
144+
assert.deepStrictEqual(_lib__rspack_import_0__["default"], 401);
145145
assert.deepStrictEqual(DO_NOT_CONVERTED9, 403);
146146
assert.deepStrictEqual(lib.DO_NOT_CONVERTED9, 403);
147147

‎tests/rspack-test/builtinCases/plugin-javascript/hashbang/__snapshots__/output.snap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
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 _lib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./lib.js");
6+
/* import */var _lib__rspack_import_0__ = __webpack_require__("./lib.js");
77
//#!/usr/bin/env node
88

99

10-
console.log("index", _lib__WEBPACK_IMPORTED_MODULE_0__.foo);
10+
console.log("index", _lib__rspack_import_0__.foo);
1111

1212

1313
}),

0 commit comments

Comments
 (0)