Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
a5d0561
Bump react-router in Dnn.ContactList.SpaReact
bdukes Mar 18, 2026
a911234
Bump ajv from 8.17.1 to 8.18.0
bdukes Mar 18, 2026
f6272ae
Bump vite in Dnn.ContactList.SpaReact
bdukes Mar 18, 2026
bc996eb
Use sass-embedded over sass
bdukes Mar 18, 2026
a497c42
Bump js-yaml from 4.1.0 to 4.1.1
bdukes Mar 18, 2026
db39f2a
Bump nx and minimatch
bdukes Mar 18, 2026
dd12eb5
Remove usage of utils package
bdukes Mar 18, 2026
7ff6ca0
Bump svgo from 4.0.0 to 4.0.1
bdukes Mar 18, 2026
fe0d36d
Bump typescript-eslint
bdukes Mar 18, 2026
17366e2
Bump storybook
bdukes Mar 18, 2026
cfd77a4
Bump typescript and tsx
bdukes Mar 18, 2026
2b78c24
Bump ESLint and plugins
bdukes Mar 18, 2026
710d9c6
Bump stencil
bdukes Mar 18, 2026
2754176
Bump dnn-elements from 0.29.0 to 0.29.2
bdukes Mar 18, 2026
c9bbb29
Bump postcss, less, cssnano, and autoprefixer
bdukes Mar 18, 2026
0e13ef8
Bump zip-lib
bdukes Mar 18, 2026
7aee69d
Bump rsbuild
bdukes Mar 20, 2026
826c242
Bump yarn from 4.12.0 to 4.13.0
bdukes Mar 20, 2026
f082d89
Bump react-widgets from 5.8.4 to 5.8.6
bdukes Mar 18, 2026
4b782e3
Bump jest and babel-jest
bdukes Mar 18, 2026
94ecbf4
Bump react-redux from 8.1.1 to 8.1.3
bdukes Mar 18, 2026
70b8b35
Bump dayjs from 1.11.18 to 1.11.20
bdukes Mar 18, 2026
9cc62a0
Bump dompurify from 3.3.2 to 3.3.3
bdukes Mar 18, 2026
002ce4c
Bump esbuild from 0.27.0 to 0.27.4
bdukes Mar 18, 2026
3fb6e53
Bump glob from 13.0.0 to 13.0.6
bdukes Mar 18, 2026
d4fcd3f
Bump globals from 16.4.0 to 16.5.0
bdukes Mar 18, 2026
0be985f
Bump html-react-parser to 5.2.17
bdukes Mar 18, 2026
44d018e
Bump lerna from 9.0.0 to 9.0.7
bdukes Mar 18, 2026
8f7bec5
Bump nanoid from 5.1.6 to 5.1.7
bdukes Mar 18, 2026
531a8c6
Bump redux-mock-store from 1.5.4 to 1.5.5
bdukes Mar 18, 2026
f81a1ee
Bump socket.io-parser from 4.2.4 to 4.2.6
bdukes Mar 18, 2026
0ae2415
Bump flatted from 3.4.1 to 3.4.2
bdukes Mar 20, 2026
a44087d
Remove dist folders
bdukes Mar 20, 2026
9e4b915
Remove unused webpack references
bdukes Mar 20, 2026
e8733f6
Remove babel
bdukes Mar 20, 2026
5872cf1
Bump tar to 7.5.11
bdukes Mar 20, 2026
c9fa23d
yarn dedupe
bdukes Mar 20, 2026
36a3737
Bump nx & minimatch
bdukes Mar 20, 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
6 changes: 3 additions & 3 deletions .github/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ If you wish to make changes to that project, please keep this in mind.

DNN uses the following technologies to create a working build:
1. MSBuild. This is Microsoft Visual Studio's built in mechanism to compile C#. It can also run auxiliary tasks (like packaging the included modules). These tasks are specified in `.build` and `.targets` files and can leverage .net assemblies to do its magic. Almost all central MSBuild code is in the `Build/BuildScripts` folder. Main folder location settings can be found in the `DNN_Platform.build` file in the root of the repository which can be overridden using a `DNN_Platform.local.build` file at the same location.
2. Webpack. The "Admin Experience" (which is the project that contains the UI for managing DNN) contains a number of client-side Javascript projects (mostly React projects). These are built using Webpack. Webpack is triggered in the main build process in the `Build/BuildScripts/AEModule.build` script. But it can be run on individual projects if you need to.
2. Rsbuild. The "Admin Experience" (which is the project that contains the UI for managing DNN) contains a number of client-side Javascript projects (mostly React projects). These are built using Rsbuild. Rsbuild is triggered in the main build process in the `Build/BuildScripts/AEModule.build` script. But it can be run on individual projects if you need to.
3. [Cake Build](https://cakebuild.net/). This uses C# code to run build tasks. We use Cake for orchestrating the entire build process (e.g. packaging of the platform) and for auxiliary tasks like creating a dev site. All Cake scripts are found in the `Build/Cake` folder. After Cake first runs it bootstraps itself and creates the `tools` folder where the various assemblies can be found. Note the scripts use the [DNN Cake Utils](https://github.com/DNNCommunity/Dnn.CakeUtils) assembly to do the heavy lifting.

## Build to create packages

This process uses Cake. Open Powershell at the root of the repository folder and enter:
This process uses Cake. Open PowerShell at the root of the repository folder and enter:

```
.\build.ps1
Expand Down Expand Up @@ -115,7 +115,7 @@ To build the .net projects to the right location, you'll need to create your ove
Once you've created this file every time you click "rebuild" in Visual Studio on a project (or the solution) you'll see the content change in your dev site.
**Note**: You may have to restart Visual Studio for this new build file to take effect.

For the Webpack projects it is set up to read from the `settings.local.json` file and use the `WebsitePath` to copy generated js files to their right place.
For the Rsbuild projects it is set up to read from the `settings.local.json` file and use the `WebsitePath` to copy generated js files to their right place.

## Build React Projects

Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Dnn.ClientSide/build.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import esbuild from "esbuild";
import * as sass from "sass";
import * as sass from "sass-embedded";
import path from "path";
import fs from "fs";
import chokidar from "chokidar";
Expand Down Expand Up @@ -52,7 +52,7 @@ function normalizePath(filePath: string): string {
// Compile SCSS to CSS with sourcemaps
async function buildScss(input: string, output: string): Promise<void> {
try {
const result = sass.compile(
const result = await sass.compileAsync(
input,
{
sourceMap: true,
Expand Down
14 changes: 7 additions & 7 deletions DNN Platform/Dnn.ClientSide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
"devDependencies": {
"@types/node": "^24.9.0",
"@types/postcss-import": "^14.0.3",
"autoprefixer": "^10.4.21",
"autoprefixer": "^10.4.27",
"chokidar": "^4.0.3",
"cssnano": "^7.1.1",
"esbuild": "^0.27.0",
"eslint": "^9.38.0",
"cssnano": "^7.1.3",
"esbuild": "^0.27.4",
"eslint": "^9.39.4",
"modern-normalize": "^3.0.1",
"postcss": "^8.5.6",
"postcss": "^8.5.8",
"postcss-banner": "^4.0.1",
"postcss-cli": "^11.0.1",
"postcss-import": "^16.1.1",
"sass": "^1.93.2",
"tsx": "^4.20.6",
"sass-embedded": "^1.98.0",
"tsx": "^4.21.0",
"typescript": "^5.9.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
},
"license": "MIT",
"devDependencies": {
"@dnncommunity/dnn-elements": "^0.29.0",
"@eslint/js": "^9.38.0",
"@stencil/core": "^4.38.2",
"@dnncommunity/dnn-elements": "^0.29.2",
"@eslint/js": "^9.39.4",
"@stencil/core": "^4.43.2",
"@stencil/eslint-plugin": "^1.1.0",
"@stencil/sass": "^3.2.2",
"@stencil/store": "^2.2.0",
"@stencil/sass": "^3.2.3",
"@stencil/store": "^2.2.2",
"@types/node": "^24.9.0",
"@typescript-eslint/utils": "^8.46.2",
"eslint": "^9.38.0",
"@typescript-eslint/utils": "^8.57.1",
"eslint": "^9.39.4",
"jiti": "^2.6.1",
"typescript": "^5.9.3",
"typescript-eslint": "^8.46.2"
"typescript-eslint": "^8.57.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"dependencies": {
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.0"
"react-router": "^7.13.1"
},
"devDependencies": {
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"typescript": "^5.5.4",
"vite": "^5.4.3"
"@vitejs/plugin-react": "^6.0.1",
"typescript": "^5.9.3",
"vite": "^8.0.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HashRouter as Router, Routes, Route } from 'react-router-dom';
import { HashRouter as Router, Routes, Route } from 'react-router';
import { SecurityContext } from './types/Security';
import { ModuleContext } from './types/Module';
import ContactList from './pages/ContactList';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { useNavigate, useParams } from 'react-router';
import { Contact } from '../types/Contact';
import { ModuleContext } from '../types/Module';
import { getContact, saveContact } from '../services/services';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';
import { Contact } from '../types/Contact';
import { SecurityContext } from '../types/Security';
import { ModuleContext } from '../types/Module';
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Skins/Aperture/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import esbuild from "esbuild";
import path from "path";
import settings from "../../../settings.local.json";
import fs from "fs";
import sass from "sass";
import * as sass from "sass-embedded";
import postcss from "postcss";
import postcssImport from "postcss-import";
import autoprefixer from "autoprefixer";
Expand Down Expand Up @@ -97,7 +97,7 @@ function ensureDirectoryExists(filePath: string): void {
/** Compile SCSS to CSS with sourcemaps */
async function buildScss(input: string, output: string): Promise<void> {
try {
const result = sass.compile(
const result = await sass.compileAsync(
input,
{
sourceMap: true,
Expand Down
12 changes: 6 additions & 6 deletions DNN Platform/Skins/Aperture/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
"@types/postcss-import": "^14.0.3",
"browser-sync": "^3.0.4",
"chokidar": "^4.0.3",
"cssnano": "^7.1.1",
"glob": "^13.0.0",
"postcss": "^8.5.6",
"cssnano": "^7.1.3",
"glob": "^13.0.6",
"postcss": "^8.5.8",
"postcss-banner": "^4.0.1",
"postcss-cli": "^11.0.1",
"postcss-import": "^16.1.1",
"sass": "^1.93.2",
"tsx": "^4.20.6",
"sass-embedded": "^1.98.0",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
"zip-lib": "^1.1.2"
"zip-lib": "^1.2.2"
},
"browserslist": [
"last 2 versions",
Expand Down
18 changes: 0 additions & 18 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/.babelrc

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ const config = [
}
}
},
{
files: ["webpack.config.js"],
languageOptions: {
sourceType: "commonjs",
}
},
{
settings: {
react: {
Expand Down
18 changes: 9 additions & 9 deletions Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
},
"devDependencies": {
"@dnnsoftware/dnn-react-common": "10.3.0",
"@rsbuild/core": "^1.6.3",
"@rsbuild/plugin-less": "^1.5.0",
"@rsbuild/plugin-react": "^1.4.2",
"@rsbuild/core": "^1.7.3",
"@rsbuild/plugin-less": "^1.6.2",
"@rsbuild/plugin-react": "^1.4.6",
"array.prototype.find": "2.2.3",
"array.prototype.findindex": "2.2.4",
"create-react-class": "^15.7.0",
"es6-object-assign": "1.1.0",
"eslint": "9.38.0",
"eslint": "9.39.4",
"eslint-plugin-react": "7.37.5",
"globals": "^16.4.0",
"less": "4.4.2",
"globals": "^16.5.0",
"less": "4.6.4",
"prop-types": "15.8.1",
"react": "^16.14.0",
"react-click-outside": "^3.0.1",
"react-dom": "^16.14.0",
"react-hot-loader": "4.13.1",
"react-redux": "^8.1.1",
"react-redux": "^8.1.3",
"redux": "^4.2.1",
"redux-devtools": "3.7.0",
"redux-devtools-dock-monitor": "1.2.0",
Expand All @@ -37,7 +37,7 @@
"typescript": "^5.9.3"
},
"dependencies": {
"dompurify": "^3.3.0",
"html-react-parser": "^5.2.10"
"dompurify": "^3.3.3",
"html-react-parser": "^5.2.17"
}
}
11 changes: 0 additions & 11 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/.babelrc

This file was deleted.

6 changes: 0 additions & 6 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ const config = [
}
}
},
{
files: ["webpack.config.js"],
languageOptions: {
sourceType: "commonjs",
}
},
{
settings: {
react: {
Expand Down
18 changes: 9 additions & 9 deletions Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"lint": "eslint --fix"
},
"devDependencies": {
"@rsbuild/core": "^1.6.3",
"@rsbuild/plugin-less": "^1.5.0",
"@rsbuild/plugin-react": "^1.4.2",
"@rsbuild/core": "^1.7.3",
"@rsbuild/plugin-less": "^1.6.2",
"@rsbuild/plugin-react": "^1.4.6",
"create-react-class": "^15.7.0",
"dayjs": "^1.11.18",
"dayjs": "^1.11.20",
"es6-promise": "4.2.8",
"eslint": "9.38.0",
"eslint": "9.39.4",
"eslint-plugin-react": "7.37.5",
"globals": "^16.4.0",
"less": "4.4.2",
"globals": "^16.5.0",
"less": "4.6.4",
"prop-types": "^15.8.1",
"react": "^16.14.0",
"react-collapse": "5.1.1",
Expand All @@ -28,10 +28,10 @@
"react-hot-loader": "4.13.1",
"react-modal": "3.16.3",
"react-motion": "0.5.2",
"react-redux": "8.1.1",
"react-redux": "8.1.3",
"react-tabs": "3.2.3",
"react-tooltip": "4.5.1",
"react-widgets": "^5.8.4",
"react-widgets": "^5.8.6",
"redux": "4.2.1",
"redux-devtools": "3.7.0",
"redux-devtools-dock-monitor": "1.2.0",
Expand Down
Loading
Loading