Skip to content

Commit

Permalink
chore(workflow): merge website folder to the root pnpm workspace (#8114)
Browse files Browse the repository at this point in the history
* chore(workflow): add website folder to root workspace

* fix: snapshot

* fix: snapshot
  • Loading branch information
chenjiahan authored Oct 15, 2024
1 parent 25af140 commit bd4efea
Show file tree
Hide file tree
Showing 14 changed files with 4,904 additions and 8,645 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@taplo/cli": "^0.7.0",
"@types/is-ci": "^3.0.4",
"@types/jest": "29.5.12",
"@types/node": "20.12.7",
"@types/node": "^20.12.7",
"@types/rimraf": "3.0.2",
"check-dependency-version-consistency": "^4.1.0",
"commander": "12.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@rspack/core": "workspace:*",
"@rspack/dev-server": "1.0.5",
"@rspack/plugin-react-refresh": "1.0.0",
"@swc/helpers": "0.5.8",
"@swc/helpers": "0.5.13",
"@types/fs-extra": "11.0.4",
"babel-loader": "^9.1.3",
"fs-extra": "^11.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/rspack-test-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@rspack/core": "workspace:*",
"@rspack/plugin-preact-refresh": "1.0.0",
"@rspack/plugin-react-refresh": "1.0.0",
"@swc/helpers": "0.5.8",
"@swc/helpers": "0.5.13",
"@swc/plugin-remove-console": "^3.0.0",
"@types/babel__generator": "7.6.8",
"@types/babel__traverse": "7.20.5",
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
```js title=main.js
"use strict";
(self['webpackChunkwebpack'] = self['webpackChunkwebpack'] || []).push([["main"], {
"../../../../../node_modules/.pnpm/@swc+helpers@0.5.8/node_modules/@swc/helpers/esm/_create_class.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
"../../../../../node_modules/.pnpm/@swc+helpers@0.5.13/node_modules/@swc/helpers/esm/_create_class.js": (function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
__webpack_require__.d(__webpack_exports__, {
_: function() { return _create_class; }
});
Expand Down Expand Up @@ -33,7 +33,7 @@ function _create_class(Constructor, protoProps, staticProps) {

}),
"./util.js": (function (__unused_webpack_module, __unused_webpack___webpack_exports__, __webpack_require__) {
/* harmony import */var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../../../../node_modules/.pnpm/@swc+helpers@0.5.8/node_modules/@swc/helpers/esm/_create_class.js");
/* harmony import */var _swc_helpers_create_class__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../../../../node_modules/.pnpm/@swc+helpers@0.5.13/node_modules/@swc/helpers/esm/_create_class.js");

var ConsoleExporterWeb;
ConsoleExporterWeb = (function () {
Expand Down
6,456 changes: 4,835 additions & 1,621 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
packages:
- "packages/*"
- "scripts"
- "website"
- "packages/playground/fixtures/**"
- "packages/create-rspack/**"
- "npm/*"
Expand Down
4 changes: 2 additions & 2 deletions tests/diff-test/arco-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@loadable/component": "^5.15.2",
"@turf/turf": "^6.5.0",
"arco-design-pro": "^2.3.0",
"axios": "^0.24.0",
"axios": "^1.6.1",
"bizcharts": "^4.1.15",
"classnames": "^2.3.1",
"copy-to-clipboard": "^3.3.1",
Expand All @@ -41,7 +41,7 @@
"@rspack/plugin-react-refresh": "1.0.0",
"@svgr/webpack": "^8.0.0",
"@swc/core": "1.4.0",
"@swc/helpers": "0.5.8",
"@swc/helpers": "0.5.13",
"bundle-stats": "^4.1.2",
"css-loader": "^6.11.0",
"html-webpack-plugin": "^5.5.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._abx7cetgatnhmkwejxyhi55br4/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.4.0_@swc+helpers@0._jlcdgjlw2ezzhg43ml3d627wdu/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._abx7cetgatnhmkwejxyhi55br4/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.4.0_@swc+helpers@0._jlcdgjlw2ezzhg43ml3d627wdu/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._abx7cetgatnhmkwejxyhi55br4/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.4.0_@swc+helpers@0._jlcdgjlw2ezzhg43ml3d627wdu/node_modules/css-loader/dist/cjs.js!./extra.css ***!
\**********************************************************************************************************************************************************************************************************************/
body {
background: yellow;
Expand Down
4 changes: 2 additions & 2 deletions tests/webpack-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@rspack/core": "workspace:*",
"node-polyfill-webpack-plugin": "3.0.0",
"@types/node": "^20.9.4",
"@types/node": "^20.12.7",
"@types/rimraf": "3.0.2",
"@types/watchpack": "^2.4.0",
"@types/webpack-sources": "3.2.3",
Expand Down Expand Up @@ -57,7 +57,7 @@
},
"dependencies": {
"@rspack/binding": "workspace:*",
"@swc/helpers": "0.5.1",
"@swc/helpers": "0.5.13",
"browserslist": "^4.21.3",
"enhanced-resolve": "5.12.0",
"graceful-fs": "4.2.10",
Expand Down
11 changes: 5 additions & 6 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"check:ci": "pnpm run check:lint-ci && pnpm run check:format-ci && pnpm run check:spell"
},
"license": "MIT",
"packageManager": "pnpm@9.12.1",
"dependencies": {
"@rstack-dev/doc-ui": "1.5.2",
"antd": "5.19.3",
Expand All @@ -26,15 +25,15 @@
"mermaid": "^10.9.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"semver": "^7.5.4",
"tailwindcss": "^3.2.7"
"semver": "^7.6.2",
"tailwindcss": "^3.3.0"
},
"devDependencies": {
"@biomejs/biome": "1.8.0",
"@rspress/plugin-rss": "1.33.1",
"@types/node": "^18.11.18",
"@types/react": "^18.0.27",
"@types/semver": "^7.5.2",
"@types/node": "^20.12.7",
"@types/react": "^18.2.48",
"@types/semver": "^7.5.6",
"case-police": "0.6.1",
"cspell": "^8.7.0",
"cspell-ban-words": "0.0.3",
Expand Down
Loading

2 comments on commit bd4efea

@rspack-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 Benchmark detail: Open

Name Base (2024-10-15 25af140) Current Change
10000_development-mode + exec 2.12 s ± 39 ms 2.11 s ± 27 ms -0.50 %
10000_development-mode_hmr + exec 665 ms ± 22 ms 658 ms ± 10 ms -1.03 %
10000_production-mode + exec 2.65 s ± 33 ms 2.64 s ± 24 ms -0.35 %
arco-pro_development-mode + exec 1.82 s ± 87 ms 1.76 s ± 61 ms -3.09 %
arco-pro_development-mode_hmr + exec 426 ms ± 1.9 ms 426 ms ± 0.78 ms +0.09 %
arco-pro_production-mode + exec 3.04 s ± 65 ms 3.06 s ± 96 ms +0.71 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec 3.15 s ± 70 ms 3.1 s ± 90 ms -1.62 %
threejs_development-mode_10x + exec 1.64 s ± 15 ms 1.64 s ± 16 ms +0.34 %
threejs_development-mode_10x_hmr + exec 788 ms ± 11 ms 791 ms ± 11 ms +0.31 %
threejs_production-mode_10x + exec 4.97 s ± 28 ms 4.98 s ± 31 ms +0.21 %

@rspack-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 Ran ecosystem CI: Open

suite result
modernjs ✅ success
_selftest ✅ success
rspress ✅ success
rslib ✅ success
rsbuild ✅ success
examples ✅ success
devserver ❌ failure

Please sign in to comment.