Skip to content

chore: remove angularjs integration #27121

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
VasilyStrelyaev merged 2 commits into from
Apr 16, 2024
Merged

chore: remove angularjs integration #27121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f794391
remove angularjs integration
VasilyStrelyaev Apr 9, 2024
b45ad46
Address Vlad's remarks
VasilyStrelyaev Apr 15, 2024
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
2 changes: 0 additions & 2 deletions apps/demos/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,7 @@ module.exports = {
}, {
files: [
'Demos/**/jQuery/*.*',
'Demos/**/AngularJS/*.*',
'utils/templates/jQuery/**/*.*',
'utils/templates/AngularJS/**/*.*',
],
env: {
jquery: true,
Expand Down
2 changes: 0 additions & 2 deletions apps/demos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
"@angular/platform-browser": "12.2.17",
"@angular/platform-browser-dynamic": "12.2.17",
"@aspnet/signalr": "1.0.27",
"angular": "1.8.3",
"angular-sanitize": "1.8.3",
"cldr-core": "40.0.0",
"cldr-data": "36.0.1",
"cldr-dates-full": "40.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/utils/interactive/add-demo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const fileSystemUtils = require('../shared/fs-utils');
const menuMetaUtils = require('./menu-meta-utils');
const menuMetaData = require('../../menuMeta.json');

const existingApproaches = ['jQuery', 'AngularJS', 'Angular', 'React', 'Vue'];
const existingApproaches = ['jQuery', 'Angular', 'React', 'Vue'];

// const descriptionFileName = 'description.md';

Expand Down
121 changes: 0 additions & 121 deletions apps/demos/utils/templates/AngularJS/data.js
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions apps/demos/utils/templates/AngularJS/index.html
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions apps/demos/utils/templates/AngularJS/index.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion apps/demos/utils/visual-tests/matrix-test-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ export function getPortByIndex(testIndex) {
export function updateConfig(customSettings) {
settings.verbose = true;
settings.manualTestIndex = 0;
settings.demoExpr = /Demos\/(?<product>\w+)\/(?<demo>\w+)\/(?<framework>angular|angularjs|jquery|react|vue)\/.*/i;
settings.demoExpr = /Demos\/(?<product>\w+)\/(?<demo>\w+)\/(?<framework>angular|jquery|react|vue)\/.*/i;
settings.demoFilesExpr = /Demos\/(?<product>\w+)\/(?<demo>\w+)\/(?<data>.*)/i;
settings.commonEtalonsExpr = /testing\/etalons\/(?<product>\w+)-(?<demo>\w+)(?<suffix>.*).png/i;
settings.manualEtalonsExpr = /testing\/widgets\/(?<product>\w+)\/.*/i;
Expand Down
15 changes: 0 additions & 15 deletions package-lock.json
View file
Open in desktop

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

2 changes: 0 additions & 2 deletions packages/devextreme/build/gulp/npm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ const distGlobsPattern = (jsFolder, exclude) => [
'!artifacts/ts/cldr*',
'!artifacts/css/dx-diagram.*',
'!artifacts/css/dx-gantt.*',
`!${jsFolder}/angular**/*.*`,
`!${jsFolder}/angular*`,
`!${jsFolder}/knockout*`,
`!${jsFolder}/cldr/*.*`,
`!${jsFolder}/cldr*`,
Expand Down
3 changes: 0 additions & 3 deletions packages/devextreme/build/gulp/vendor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ const DESTINATION_JS_PATH = './' + context.RESULT_JS_PATH;
const DESTINATION_CSS_PATH = './artifacts/css';

const JS_VENDORS = [
{
path: 'angular/angular.js'
},
{
path: 'exceljs/dist/exceljs.js'
},
Expand Down
3 changes: 1 addition & 2 deletions packages/devextreme/js/__internal/ui/m_action_sheet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ const ActionSheet = CollectionWidget.inherit({
disabled: false,
showTitle: true,
title: this.option('title'),
// @ts-expect-error
deferRendering: !window.angular,
deferRendering: true,
onContentReady: this._popupContentReadyAction.bind(this),
onHidden: this.hide.bind(this),
};
Expand Down
1 change: 0 additions & 1 deletion packages/devextreme/js/bundles/modules/parts/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const DevExpress = require('../../../bundles/modules/core');
/* Integrations (dx.module-core.js) */

require('../../../integration/jquery');
require('../../../integration/angular');
require('../../../integration/knockout');

require('../../../localization/globalize/core');
Expand Down
5 changes: 0 additions & 5 deletions packages/devextreme/js/integration/angular.js
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions packages/devextreme/js/integration/angular/action_executors.js
View file
Open in desktop

This file was deleted.

Loading