Skip to content

Moving from Webpack to RS Build phase 2 #7115

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

Merged
bdukes merged 26 commits into from
Mar 20, 2026
Merged

Moving from Webpack to RS Build phase 2 #7115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7e7f023
Nest set of react projects converted to RS Build
donker Mar 14, 2026
d93701e
Fixing taxonomy project
donker Mar 14, 2026
c00fb4c
Fix to themes project
donker Mar 14, 2026
2df27bd
Fix scheduler project
donker Mar 14, 2026
11000e5
Fix the extensions project
donker Mar 14, 2026
db7b245
Migrate export-bundle project to rsbuild
donker Mar 14, 2026
283853e
Migrate the react common library
donker Mar 14, 2026
681cfaa
Migrate dnn-users-exportables project
donker Mar 14, 2026
8a52e8f
Migrate the dnn-sites-list-view project
donker Mar 14, 2026
986a89d
Fixes
donker Mar 16, 2026
6edb814
Use npm_lifecycle_event to determine whether a production build is be…
donker Mar 16, 2026
1c7c214
Running through the PB and fixing all other errors showing up in the …
donker Mar 16, 2026
8304e00
Do the licensing module as well even though we don't use it.
donker Mar 16, 2026
db839af
Fix build warning
donker Mar 16, 2026
d6d1c79
Ignore my Cursor rules
donker Mar 16, 2026
e6b146f
Centralize rsbuild configuration for PB modules
donker Mar 17, 2026
1daa28c
Move PB generated content ignores
donker Mar 17, 2026
afe5fdb
Ignore module generated content from rsbuild
donker Mar 17, 2026
4b9e3bf
Check and improve Users and Sites subprojects
donker Mar 17, 2026
c7cea16
Fixes
donker Mar 17, 2026
d0a3d1f
Update Dnn.AdminExperience/ClientSide/modules.rsbuild.config.ts
donker Mar 17, 2026
6a9c7db
Revert changes to admin logs file
donker Mar 17, 2026
d154471
Reverting unnecessary changes
donker Mar 17, 2026
967cdac
Update Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar…
donker Mar 17, 2026
e4a1f80
Fixes
donker Mar 17, 2026
e2a4f34
One more
donker Mar 17, 2026
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
10 changes: 3 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ UpgradeLog*.XML
# Node
node_modules/

# AI Assistants
.cursor/

############
## DNN
############
Expand Down Expand Up @@ -148,10 +151,3 @@ yarn-error.log

/DotNetNuke.Internal.SourceGenerators/bin/
/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/Snapshots/*.received.*
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Pages/scripts/bundles/
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Prompt/css/Prompt.css
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/css/Roles.css
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Security/css/Security.css
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Seo/css/Seo.css
/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/css/Servers.css
3 changes: 0 additions & 3 deletions Dnn.AdminExperience/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,5 @@ ClientSide/**/node_modules
/**/yarn-error.log
/**/*-bundle.js
/**/*-bundle.js.map
/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Users/scripts/exportables/Users/UsersCommon.js
/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Sites/scripts/exportables/Sites/SitesListView.js
/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Roles/scripts/bundles/rw-widgets.svg
/Dnn.PersonaBar.Extensions/**/*.js.map

32 changes: 7 additions & 25 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,25 @@
"version": "10.3.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production",
"debug": "set NODE_ENV=debug&&webpack --mode production",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"build": "rsbuild build",
"debug": "rsbuild build",
"watch": "rsbuild dev",
"lint": "eslint --fix"
},
"devDependencies": {
"@babel/core": "^7.28.4",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/plugin-transform-object-assign": "^7.27.1",
"@babel/preset-env": "^7.28.3",
"@babel/preset-react": "^7.27.1",
"@babel/preset-typescript": "^7.28.5",
"@dnnsoftware/dnn-react-common": "10.3.0",
"@rsbuild/core": "^1.6.3",
"@rsbuild/plugin-less": "^1.5.0",
"@rsbuild/plugin-react": "^1.4.2",
"array.prototype.find": "2.2.3",
"array.prototype.findindex": "2.2.4",
"babel-loader": "10.0.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"babel-polyfill": "6.26.0",
"create-react-class": "^15.7.0",
"css-loader": "^7.1.2",
"es6-object-assign": "1.1.0",
"eslint": "9.38.0",
"eslint-plugin-react": "7.37.5",
"eslint-webpack-plugin": "^5.0.2",
"file-loader": "6.2.0",
"globals": "^16.4.0",
"i18n-webpack-plugin": "1.0.0",
"less": "4.4.2",
"less-loader": "12.3.0",
"prop-types": "15.8.1",
"raw-loader": "4.0.2",
"react": "^16.14.0",
"react-click-outside": "^3.0.1",
"react-dom": "^16.14.0",
Expand All @@ -45,14 +33,8 @@
"redux-devtools-log-monitor": "2.1.0",
"redux-immutable-state-invariant": "2.1.0",
"redux-thunk": "2.4.2",
"style-loader": "^4.0.0",
"throttle-debounce": "^5.0.2",
"typescript": "^5.9.3",
"url-loader": "4.1.1",
"webpack": "5.104.1",
"webpack-bundle-size-analyzer": "3.1.0",
"webpack-cli": "6.0.1",
"webpack-dev-server": "5.2.2"
"typescript": "^5.9.3"
},
"dependencies": {
"dompurify": "^3.3.0",
Expand Down
23 changes: 23 additions & 0 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/rsbuild.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { defineConfig } from "@rsbuild/core";
import path from "path";
import { defaultConfig, resolveWebsitePath } from "../modules.rsbuild.config";

const websitePath = resolveWebsitePath();
const isProduction = process.env.npm_lifecycle_event === "build";
const useWebsitePath = !isProduction && websitePath !== "";
const distPath = useWebsitePath
? path.join(
websitePath,
"DesktopModules/Admin/Dnn.PersonaBar/Modules/Dnn.AdminLogs/",
)
: "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.AdminLogs/";
const config = defaultConfig(
__dirname,
"src/main.jsx",
"adminLogs-bundle.js",
"AdminLogs.css",
isProduction,
distPath,
);

export default defineConfig(config);
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/AdminLog/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ class AdminLogPanelBody extends Component {
return <div className="logHeader-wrapper">{tableHeaders}</div>;
}


renderedLogList() {
const {props} = this;
return props.logList.map((term, index) => {
Expand Down Expand Up @@ -403,4 +403,4 @@ function mapStateToProps(state) {
};
}

export default connect(mapStateToProps)(AdminLogPanelBody);
export default connect(mapStateToProps)(AdminLogPanelBody);
4 changes: 2 additions & 2 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/src/components/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ class App extends Component {
let tabHeaders = [];
if (canViewAdminLogs) {
tabHeaders.push(Localization.get("AdminLogs.Header"));
renderTabs.push(<AdminLogs />);
renderTabs.push(<AdminLogs key="admin-logs-tab" />);
}
if (canViewLogSettings) {
tabHeaders.push(Localization.get("LogSettings.Header"));
renderTabs.push(<LogSettings />);
renderTabs.push(<LogSettings key="log-settings-tab" />);
}

return (
Expand Down
14 changes: 7 additions & 7 deletions ...Experience/ClientSide/AdminLogs.Web/src/components/LogSettings/LogSettingEditor/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ class LogSettingEditor extends Component {
}
getEnabledStatus(key) {
const {state} = this;
const toBoolean = (value) => value === true || value === 1 || value === "1" || value === "true";
switch (key) {
case "EmailNotification":
return state.logSettingDetail.EmailNotificationIsActive !== undefined ? state.logSettingDetail.EmailNotificationIsActive : false;
return state.logSettingDetail.EmailNotificationIsActive !== undefined ? toBoolean(state.logSettingDetail.EmailNotificationIsActive) : false;
case "Logging":
return state.logSettingDetail.LoggingIsActive !== undefined ? state.logSettingDetail.LoggingIsActive : false;
return state.logSettingDetail.LoggingIsActive !== undefined ? toBoolean(state.logSettingDetail.LoggingIsActive) : false;
default:
break;
}
Expand Down Expand Up @@ -267,13 +268,12 @@ class LogSettingEditor extends Component {
onChange={this.onTextChange.bind(this, "MailToAddress") }/>
</div>
</div>;
let children = [];
children.push(columnOne);
children.push(columnTwo);

return (
<div className="log-setting-editor">
<Grid numberOfColumns={2}>{children}</Grid>
<Grid numberOfColumns={2}>
<React.Fragment key="settings-column-left">{columnOne}</React.Fragment>
<React.Fragment key="settings-column-right">{columnTwo}</React.Fragment>
</Grid>
<div className="buttons-box">
{this.props.logTypeSettingId !== "" && <Button type="danger" onClick={this.deleteLogSetting.bind(this) }>{Localization.get("ConfigBtnDelete") }</Button>}
<Button type="secondary" onClick={this.props.Collapse.bind(this) }>{Localization.get("ConfigBtnCancel") }</Button>
Expand Down
96 changes: 0 additions & 96 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/webpack.config.js
View file
Open in desktop

This file was deleted.

33 changes: 7 additions & 26 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,23 @@
"version": "10.3.0",
"private": true,
"scripts": {
"build": "set NODE_ENV=production&&webpack --mode production --progress",
"debug": "set NODE_ENV=debug&&webpack --mode production --progress",
"watch": "set NODE_ENV=debug & webpack --mode=development --progress --watch",
"analyze": "set NODE_ENV=production&&webpack --config webpack.config.js --profile --json > stats.json&&webpack-bundle-analyzer stats.json",
"build": "rsbuild build",
"debug": "rsbuild build --mode development",
"watch": "rsbuild dev",
"lint": "eslint --fix"
},
"devDependencies": {
"@babel/core": "^7.28.4",
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
"@babel/preset-env": "^7.28.3",
"@babel/preset-react": "^7.27.1",
"babel-loader": "^10.0.0",
"babel-plugin-transform-object-assign": "6.22.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
"babel-polyfill": "6.26.0",
"@rsbuild/core": "^1.6.3",
"@rsbuild/plugin-less": "^1.5.0",
"@rsbuild/plugin-react": "^1.4.2",
"create-react-class": "^15.7.0",
"css-loader": "^7.1.2",
"dayjs": "^1.11.18",
"es6-promise": "4.2.8",
"eslint": "9.38.0",
"eslint-plugin-react": "7.37.5",
"eslint-webpack-plugin": "^5.0.2",
"file-loader": "6.2.0",
"globals": "^16.4.0",
"json-loader": "^0.5.7",
"less": "4.4.2",
"less-loader": "12.3.0",
"prop-types": "^15.8.1",
"raw-loader": "4.0.2",
"react": "^16.14.0",
"react-collapse": "5.1.1",
"react-custom-scrollbars": "4.2.1",
Expand All @@ -51,14 +38,8 @@
"redux-devtools-log-monitor": "2.1.0",
"redux-immutable-state-invariant": "2.1.0",
"redux-thunk": "2.4.2",
"source-map-loader": "^5.0.0",
"style-loader": "4.0.0",
"throttle-debounce": "5.0.2",
"url-loader": "4.1.1",
"webpack": "5.104.1",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "6.0.1",
"webpack-dev-server": "5.2.2"
"typescript": "^5.9.3"
},
"dependencies": {
"@dnnsoftware/dnn-react-common": "10.3.0"
Expand Down
Loading
Loading