Skip to content

Commit 2d92113

Browse files
fix demos dx=angular bundles for devextreme-angular/tokens
1 parent 8dc2154 commit 2d92113

382 files changed

Lines changed: 403 additions & 401 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/demos/configs/Angular/config.bundle.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const bundleConfig = {
4141
'devextreme-angular/common/core/*',
4242
'devextreme-angular/common/export/*',
4343
'devextreme-angular/core/*',
44+
'devextreme-angular/tokens/*',
4445
'devexpress-gantt',
4546
'devexpress-diagram',
4647
'rxjs/*',

apps/demos/configs/Angular/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ window.config = {
195195
'devextreme-angular/common/grids': 'bundles:devextreme-angular/devextreme-angular-common-grids.umd.js',
196196
'devextreme-angular/common': 'bundles:devextreme-angular/devextreme-angular-common.umd.js',
197197
'devextreme-angular/http': 'bundles:devextreme-angular/devextreme-angular-http.umd.js',
198+
'devextreme-angular/tokens': 'bundles:devextreme-angular/devextreme-angular-tokens.umd.js',
198199
...componentNames.reduce((acc, name) => {
199200
acc[`devextreme-angular/ui/${name}`] = `bundles:devextreme-angular/devextreme-angular-ui-${name}.umd.js`;
200201
acc[`devextreme-angular/ui/${name}/nested`] = `bundles:devextreme-angular/devextreme-angular-ui-${name}-nested.umd.js`;

apps/demos/rollup.devextreme-angular.umd.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const inputs = {
1616
'devextreme-angular': `${baseDir}devextreme-angular.mjs`,
1717
'devextreme-angular-core': `${baseDir}devextreme-angular-core.mjs`,
1818
'devextreme-angular-http': `${baseDir}devextreme-angular-http.mjs`,
19+
'devextreme-angular-tokens': `${baseDir}devextreme-angular-tokens.mjs`,
1920
...fileNames.reduce((acc, name) => {
2021
acc[name] = `${baseDir}${name}.mjs`;
2122

apps/demos/utils/bundle/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ const prepareConfigs = (framework)=> {
146146
additionPaths = {
147147
'devextreme-angular': `${bundlesRoot}/devextreme-angular.umd.js`,
148148
'devextreme-angular/core': `${bundlesRoot}/devextreme-angular-core.umd.js`,
149+
'devextreme-angular/tokens': `${bundlesRoot}/devextreme-angular-tokens.umd.js`,
149150
...componentNames.reduce((items, item) => {
150151
// eslint-disable-next-line no-param-reassign
151152
items[`devextreme-angular/ui/${item.replace('-nested', '/nested')}`] = `${bundlesRoot}/devextreme-angular-ui-${item}.umd.js`;

packages/devextreme-angular/src/core/nested-option.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
Component, QueryList, ElementRef, Renderer2, EventEmitter, ContentChildren, InjectionToken,
2+
Component, QueryList, ElementRef, Renderer2, EventEmitter,
33
} from '@angular/core';
44

55
import render from 'devextreme/core/renderer';
@@ -8,8 +8,6 @@ import domAdapter from 'devextreme/core/dom_adapter';
88
import { getElement } from './utils';
99
import { DX_TEMPLATE_WRAPPER_CLASS } from './template';
1010

11-
export const NESTED_ITEM_TOKEN = new InjectionToken<string>('nested-item');
12-
1311
const VISIBILITY_CHANGE_SELECTOR = 'dx-visibility-change-handler';
1412

1513
export interface INestedOptionContainer {
File renamed without changes.

packages/devextreme-angular/src/ui/nested/tokens/ng-package.json renamed to packages/devextreme-angular/src/tokens/ng-package.json

File renamed without changes.

packages/devextreme-angular/src/ui/accordion/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import { DxiAccordionItemModule } from 'devextreme-angular/ui/accordion/nested';
4848

4949
import {
5050
PROPERTY_TOKEN_items,
51-
} from 'devextreme-angular/ui/nested/tokens';
51+
} from 'devextreme-angular/tokens';
5252

5353

5454

packages/devextreme-angular/src/ui/accordion/nested/item-dxi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
} from 'devextreme-angular/core';
2828
import { CollectionNestedOption } from 'devextreme-angular/core';
2929

30-
import { PROPERTY_TOKEN_items } from 'devextreme-angular/ui/nested/tokens';
30+
import { PROPERTY_TOKEN_items } from 'devextreme-angular/tokens';
3131

3232

3333
@Component({

packages/devextreme-angular/src/ui/action-sheet/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import { DxiActionSheetItemModule } from 'devextreme-angular/ui/action-sheet/nes
4848

4949
import {
5050
PROPERTY_TOKEN_items,
51-
} from 'devextreme-angular/ui/nested/tokens';
51+
} from 'devextreme-angular/tokens';
5252

5353

5454

0 commit comments

Comments
 (0)