Skip to content

Commit

Permalink
Merge branch 'main' into mietee_v7_1213
Browse files Browse the repository at this point in the history
  • Loading branch information
chenjiahan committed Dec 13, 2024
2 parents 2c3ecb0 + a313b28 commit b46c20e
Show file tree
Hide file tree
Showing 12 changed files with 1,612 additions and 1,604 deletions.
1,227 changes: 838 additions & 389 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ inventory = { version = "=0.1" }
rkyv = { version = "=0.8.8" }

# Must be pinned with the same swc versions
swc = { version = "5.0.0" }
swc = { version = "=9.0.0" }
swc_config = { version = "=1.0.0" }
swc_core = { version = "=5.0.1", default-features = false }
swc_ecma_minifier = { version = "=5.0.0", default-features = false }
swc_error_reporters = { version = "=5.0.0" }
swc_html = { version = "=5.0.0" }
swc_html_minifier = { version = "=5.0.0", default-features = false }
swc_node_comments = { version = "=4.0.0" }
swc_core = { version = "=9.0.0", default-features = false }
swc_ecma_minifier = { version = "=6.0.1", default-features = false }
swc_error_reporters = { version = "=6.0.0" }
swc_html = { version = "=6.0.0" }
swc_html_minifier = { version = "=6.0.0", default-features = false }
swc_node_comments = { version = "=5.0.0" }


rspack_dojang = { version = "0.1.9" }
Expand Down
4 changes: 2 additions & 2 deletions packages/rspack-test-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"@rspack/core": "workspace:*",
"@rspack/plugin-preact-refresh": "1.1.0",
"@rspack/plugin-react-refresh": "1.0.0",
"@swc/helpers": "0.5.13",
"@swc/plugin-remove-console": "^5.0.0",
"@swc/helpers": "0.5.15",
"@swc/plugin-remove-console": "^6.0.2",
"@types/babel__generator": "7.6.8",
"@types/babel__traverse": "7.20.6",
"@types/fs-extra": "11.0.4",
Expand Down
962 changes: 484 additions & 478 deletions packages/rspack/etc/core.api.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/rspack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"directory": "packages/rspack"
},
"devDependencies": {
"@swc/core": "1.7.40",
"@swc/types": "0.1.12",
"@swc/core": "1.10.1",
"@swc/types": "0.1.17",
"@types/graceful-fs": "4.1.9",
"@types/watchpack": "^2.4.0",
"@types/webpack-sources": "3.2.3",
Expand Down
983 changes: 268 additions & 715 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@rspack/core": "workspace:*",
"@rspack/dev-server": "1.0.10",
"@rspack/plugin-react-refresh": "1.0.0",
"@swc/helpers": "0.5.13",
"@swc/helpers": "0.5.15",
"@types/fs-extra": "11.0.4",
"babel-loader": "^9.1.3",
"fs-extra": "^11.2.0",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*!**********************************************************************************************************************************************************************************************************************!*\
!*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.4.0_@swc+helpers@0._du3mfhu6fomokihheysxef5b5i/node_modules/css-loader/dist/cjs.js!./style.css ***!
!*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./style.css ***!
\**********************************************************************************************************************************************************************************************************************/
body {
background: red;
}

/*!**********************************************************************************************************************************************************************************************************************!*\
!*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.4.0_@swc+helpers@0._du3mfhu6fomokihheysxef5b5i/node_modules/css-loader/dist/cjs.js!./other.css ***!
!*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./other.css ***!
\**********************************************************************************************************************************************************************************************************************/
body {
background: blue;
}

/*!**********************************************************************************************************************************************************************************************************************!*\
!*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.4.0_@swc+helpers@0._du3mfhu6fomokihheysxef5b5i/node_modules/css-loader/dist/cjs.js!./extra.css ***!
!*** css ../../../../../node_modules/.pnpm/css-loader@6.11.0_@rspack+core@packages+rspack_webpack@5.94.0_@swc+core@1.10.1_@swc+helpers@0_aku7xtrc3x5l3vpfenkieaz5om/node_modules/css-loader/dist/cjs.js!./extra.css ***!
\**********************************************************************************************************************************************************************************************************************/
body {
background: yellow;
Expand Down
4 changes: 2 additions & 2 deletions tests/plugin-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"repository": "web-infra-dev/rspack",
"devDependencies": {
"@rspack/core": "workspace:*",
"@swc/core": "1.4.0",
"@swc/jest": "^0.2.36",
"@swc/core": "1.10.1",
"@swc/jest": "^0.2.37",
"css-loader": "^6.11.0",
"file-loader": "^6.2.0",
"html-loader": "2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/webpack-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},
"dependencies": {
"@rspack/binding": "workspace:*",
"@swc/helpers": "0.5.13",
"@swc/helpers": "0.5.15",
"browserslist": "^4.21.3",
"enhanced-resolve": "5.12.0",
"graceful-fs": "4.2.10",
Expand Down
2 changes: 1 addition & 1 deletion website/docs/en/guide/optimization/analysis.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Rsdoctor provides the `Bundle Size` module, which is mainly used to analyze the
style={{ margin: 'auto' }}
/>

Click on the **"Bundle Size"** option in the navigation bar to view the Bundle analysis report. You can see more details from this page: [Bundle Size](https://rsdoctor.dev/zh/guide/usage/bundle-size)
Click on the **"Bundle Size"** option in the navigation bar to view the Bundle analysis report. You can see more details from this page: [Bundle Size](https://rsdoctor.dev/guide/usage/bundle-size)

### Reduce duplicate dependencies

Expand Down

0 comments on commit b46c20e

Please sign in to comment.