Skip to content

Commit 3813339

Browse files
chore: migrate to latest sass-embedded (#31177)
Co-authored-by: alexlavrov <[email protected]>
1 parent 557302f commit 3813339

File tree

242 files changed

+3216
-2469
lines changed

Some content is hidden

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

242 files changed

+3216
-2469
lines changed

apps/demos/.stylelintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"shorthand-property-no-redundant-values": [ true, { "severity": "warning" }],
1717
"declaration-block-no-redundant-longhand-properties": [ true, { "severity": "warning" }],
1818
"media-feature-range-notation": null,
19-
"selector-not-notation": null
19+
"selector-not-notation": null,
20+
"color-function-alias-notation": null
2021
}
2122
}

apps/demos/Demos/Scheduler/CellTemplates/Angular/app/app.component.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable-next-line at-rule-no-vendor-prefix, at-rule-prelude-no-invalid */
12
@-moz-document url-prefix() {
23
.dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
34
position: relative;

apps/demos/Demos/Scheduler/CellTemplates/React/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable-next-line at-rule-no-vendor-prefix, at-rule-prelude-no-invalid */
12
@-moz-document url-prefix() {
23
.dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
34
position: relative;

apps/demos/Demos/Scheduler/CellTemplates/ReactJs/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable-next-line at-rule-no-vendor-prefix, at-rule-prelude-no-invalid */
12
@-moz-document url-prefix() {
23
.dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
34
position: relative;

apps/demos/Demos/Scheduler/CellTemplates/Vue/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable-next-line at-rule-no-vendor-prefix, at-rule-prelude-no-invalid */
12
@-moz-document url-prefix() {
23
.dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
34
position: relative;

apps/demos/Demos/Scheduler/CellTemplates/jQuery/styles.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* stylelint-disable-next-line at-rule-no-vendor-prefix, at-rule-prelude-no-invalid */
12
@-moz-document url-prefix() {
23
.dx-scheduler-work-space-month .dx-scheduler-date-table-cell {
34
position: relative;

apps/demos/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@
145145
"rollup": "4.22.4",
146146
"serve-index": "1.9.1",
147147
"serve-static": "1.16.2",
148-
"stylelint": "16.5.0",
149-
"stylelint-config-recommended-vue": "1.5.0",
150-
"stylelint-config-standard": "35.0.0",
148+
"stylelint": "16.22.0",
149+
"stylelint-config-recommended-vue": "1.6.1",
150+
"stylelint-config-standard": "38.0.0",
151151
"systemjs-builder": "0.16.15",
152152
"testcafe": "3.7.2",
153153
"testcafe-reporter-spec-time": "4.0.0",

e2e/bundlers/project.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,21 @@
4747
},
4848
"dependsOn": ["build"]
4949
},
50+
"build-parcel-watcher": {
51+
"executor": "nx:run-commands",
52+
"options": {
53+
"cwd": "{projectRoot}",
54+
"command": "cross-env npm_config_build_from_source=true pnpm rebuild --recursive @parcel/watcher"
55+
},
56+
"dependsOn": ["build"]
57+
},
5058
"test--parcel": {
5159
"executor": "nx:run-commands",
5260
"options": {
5361
"cwd": "{projectRoot}",
5462
"command": "parcel build ./entry/modules_esm.js --no-cache --dist-dir ./dist/dist_parsel"
5563
},
56-
"dependsOn": ["build"]
64+
"dependsOn": ["build-parcel-watcher"]
5765
},
5866
"test--browserify-cjs": {
5967
"executor": "nx:run-commands",
@@ -72,4 +80,4 @@
7280
"dependsOn": ["build"]
7381
}
7482
}
75-
}
83+
}

packages/devextreme-react/src/core/__tests__/nested-option.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jest.useFakeTimers();
1010

1111
const NestedComponent = function NestedComponent(props: any) {
1212
return (
13-
<ConfigurationComponent<{ a: number } & React.PropsWithChildren>
13+
<ConfigurationComponent<{ a: number } & React.PropsWithChildren<unknown>>
1414
elementDescriptor={{
1515
OptionName: 'option',
1616
ExpectedChildren: {
@@ -26,7 +26,7 @@ NestedComponent.componentType = 'option';
2626

2727
const NestedComponentWithPredfeinedProps = function NestedComponentWithPredfeinedProps(props: any) {
2828
return (
29-
<ConfigurationComponent<{ a: number } & React.PropsWithChildren>
29+
<ConfigurationComponent<{ a: number } & React.PropsWithChildren<unknown>>
3030
elementDescriptor={{
3131
OptionName: 'option',
3232
PredefinedProps: {
@@ -1152,7 +1152,7 @@ describe('nested sub-option', () => {
11521152
it('is pulled according to expectations', () => {
11531153
const NestedComponentWithExpectations = function NestedComponentWithExpectations(props: any) {
11541154
return (
1155-
<ConfigurationComponent<{ a: number } & React.PropsWithChildren>
1155+
<ConfigurationComponent<{ a: number } & React.PropsWithChildren<unknown>>
11561156
elementDescriptor={{
11571157
OptionName: 'option',
11581158
ExpectedChildren: {

packages/devextreme-react/src/core/__tests__/props-updating.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface IControlledComponentProps {
3232
complexOption?: Record<string, unknown>;
3333
}
3434

35-
const ControlledComponent = memo(function ControlledComponent(props: IControlledComponentProps & React.PropsWithChildren) {
35+
const ControlledComponent = memo(function ControlledComponent(props: IControlledComponentProps & React.PropsWithChildren<unknown>) {
3636
return (
3737
<TestComponent
3838
defaults={{
@@ -54,7 +54,7 @@ const NestedComponent = function NestedComponent(props: any) {
5454
complexValue?: Record<string, unknown>;
5555
value?: number;
5656
onValueChange?: (value: number) => void;
57-
} & React.PropsWithChildren>
57+
} & React.PropsWithChildren<unknown>>
5858
elementDescriptor={{
5959
OptionName: 'nestedOption',
6060
DefaultsProps: {
@@ -73,7 +73,7 @@ const CollectionNestedComponent = function CollectionNestedComponent(props: any)
7373
<ConfigurationComponent<{
7474
a?: number;
7575
onAChange?: (value: number) => void;
76-
} & React.PropsWithChildren>
76+
} & React.PropsWithChildren<unknown>>
7777
elementDescriptor={{
7878
OptionName: 'items',
7979
IsCollectionItem: true,

0 commit comments

Comments
 (0)