Skip to content

devextreme-aspnet-data: use from /apps/demos/, remove from /packages/devextreme/, arrange vendor files (with bootstrap) #33987

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

Open
mpreyskurantov wants to merge 1 commit into
base: 26_1
Choose a base branch
from
+19 −13
Open

devextreme-aspnet-data: use from /apps/demos/, remove from /packages/devextreme/, arrange vendor files (with bootstrap) #33987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/devextreme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
"cssom": "0.5.0",
"csstype": "3.2.3",
"del": "2.2.2",
"devextreme-aspnet-data": "5.1.0",
"devextreme-cldr-data": "1.0.3",
"devextreme-exceljs-fork": "catalog:",
"devextreme-screenshot-comparer": "2.0.17",
Expand Down
13 changes: 10 additions & 3 deletions packages/devextreme/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,9 @@
{ "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": "./node_modules/devextreme-aspnet-data/js/dx.aspnet.data.js", "to": "./artifacts/js/dx.aspnet.data.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" }
]
},
"inputs": [
Expand Down Expand Up @@ -1163,6 +1165,8 @@
"{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 @@ -1171,7 +1175,8 @@
"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": "./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" }
]
},
"inputs": [
Expand All @@ -1182,7 +1187,9 @@
"{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/dx-gantt.min.css",
"{projectRoot}/artifacts/css/bootstrap.css",
"{projectRoot}/artifacts/css/bootstrap.min.css"
]
},
"copy:vendor": {
Expand Down
8 changes: 8 additions & 0 deletions packages/workflows/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
]
}
},
"copy:devextreme-aspnet-data": {
"executor": "devextreme-nx-infra-plugin:copy-files",
"options": {
"files": [
{ "from": "../../apps/demos/node_modules/devextreme-aspnet-data/js/dx.aspnet.data.js", "to": "../../artifacts/js/dx.aspnet.data.js" }
]
}
},
"copy:npm-tgz": {
"executor": "devextreme-nx-infra-plugin:copy-files",
"options": {
Expand Down
3 changes: 0 additions & 3 deletions pnpm-lock.yaml
View file
Open in desktop

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

7 changes: 1 addition & 6 deletions tools/scripts/build-all.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sh from 'shelljs';
import path from 'node:path';
import { ARTIFACTS_DIR, INTERNAL_TOOLS_ARTIFACTS, ROOT_DIR, NPM_DIR, JS_ARTIFACTS, CSS_ARTIFACTS } from './common/paths';
import { ARTIFACTS_DIR, INTERNAL_TOOLS_ARTIFACTS, ROOT_DIR, NPM_DIR } from './common/paths';
import { version as devextremeNpmVersion } from '../../packages/devextreme/package.json';

const DEVEXTREME_NPM_DIR = path.join(ROOT_DIR, 'packages/devextreme/artifacts/npm');
Expand Down Expand Up @@ -56,11 +56,6 @@ sh.pushd(path.join(ROOT_DIR, 'packages/devextreme/artifacts'));
sh.cp('-r', ['ts', 'js', 'css'], ARTIFACTS_DIR);
sh.popd();

// TODO: maybe we should add bootstrap to vendors
const BOOTSTRAP_DIR = path.join(ROOT_DIR, 'packages', 'devextreme-themebuilder', 'node_modules', 'bootstrap', 'dist');
sh.cp([path.join(BOOTSTRAP_DIR, 'js', 'bootstrap.js'), path.join(BOOTSTRAP_DIR, 'js', 'bootstrap.min.js')], JS_ARTIFACTS);
sh.cp([path.join(BOOTSTRAP_DIR, 'css', 'bootstrap.css'), path.join(BOOTSTRAP_DIR, 'css', 'bootstrap.min.css')], CSS_ARTIFACTS);

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

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