Skip to content

fix(vendor): bootstrap.* assets should NOT be devextreme-dist content, partial revert (#33987) #34158

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
mpreyskurantov merged 3 commits into from
Jun 29, 2026
+3 −9
Merged

fix(vendor): bootstrap.* assets should NOT be devextreme-dist content, partial revert (#33987) #34158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
908f407
Revert "devextreme-aspnet-data: use from /apps/demos/, remove from /p…
mpreyskurantov Jun 28, 2026
8bd276c
copy:bootstrap: build-all.ts -> nx workflows
mpreyskurantov Jun 29, 2026
287d455
non used imports
mpreyskurantov Jun 29, 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
11 changes: 2 additions & 9 deletions packages/devextreme/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,8 +1142,6 @@
{ "from": "./node_modules/devexpress-gantt/dist/dx-gantt.min.js", "to": "./artifacts/js/dx-gantt.min.js" },
{ "from": "./node_modules/devextreme-quill/dist/dx-quill.js", "to": "./artifacts/js/dx-quill.js" },
{ "from": "./node_modules/devextreme-quill/dist/dx-quill.min.js", "to": "./artifacts/js/dx-quill.min.js" },
{ "from": "../devextreme-themebuilder/node_modules/bootstrap/dist/js/bootstrap.js", "to": "./artifacts/js/bootstrap.js" },
{ "from": "../devextreme-themebuilder/node_modules/bootstrap/dist/js/bootstrap.min.js", "to": "./artifacts/js/bootstrap.min.js" },
{ "from": "../../apps/demos/node_modules/devextreme-aspnet-data/js/dx.aspnet.data.js", "to": "./artifacts/js/dx.aspnet.data.js" }
]
},
Expand Down Expand Up @@ -1172,8 +1170,6 @@
"{projectRoot}/artifacts/js/dx-gantt.min.js",
"{projectRoot}/artifacts/js/dx-quill.js",
"{projectRoot}/artifacts/js/dx-quill.min.js",
"{projectRoot}/artifacts/js/bootstrap.js",
"{projectRoot}/artifacts/js/bootstrap.min.js",
"{projectRoot}/artifacts/js/dx.aspnet.data.js"
]
},
Expand All @@ -1183,8 +1179,7 @@
"options": {
"files": [
{ "from": "./node_modules/devexpress-diagram/dist/dx-{diagram,diagram.min}.css", "to": "./artifacts/css" },
{ "from": "./node_modules/devexpress-gantt/dist/dx-{gantt,gantt.min}.css", "to": "./artifacts/css" },
{ "from": "../devextreme-themebuilder/node_modules/bootstrap/dist/css/{bootstrap,bootstrap.min}.css", "to": "./artifacts/css" }
{ "from": "./node_modules/devexpress-gantt/dist/dx-{gantt,gantt.min}.css", "to": "./artifacts/css" }
]
},
"inputs": [
Expand All @@ -1195,9 +1190,7 @@
"{projectRoot}/artifacts/css/dx-diagram.css",
"{projectRoot}/artifacts/css/dx-diagram.min.css",
"{projectRoot}/artifacts/css/dx-gantt.css",
"{projectRoot}/artifacts/css/dx-gantt.min.css",
"{projectRoot}/artifacts/css/bootstrap.css",
"{projectRoot}/artifacts/css/bootstrap.min.css"
"{projectRoot}/artifacts/css/dx-gantt.min.css"
]
},
"copy:vendor": {
Expand Down
1 change: 1 addition & 0 deletions tools/scripts/build-all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ sh.pushd(path.join(ROOT_DIR, 'packages/devextreme/artifacts'));
sh.cp('-r', ['ts', 'js', 'css'], ARTIFACTS_DIR);
sh.popd();

sh.exec('pnpm exec nx copy:bootstrap workflows');
sh.exec('pnpm run all:pack-and-copy');

sh.exec('pnpm exec nx pack devextreme-react', { silent: true });
Expand Down
Loading