Skip to content

Commit

Permalink
Merge 20_1 into preact_button (#11978)
Browse files Browse the repository at this point in the history
* DataGrid: Fix scrolling if max-height of the widget container is set to a non-integer number of pixels (T849902) (#11632)

* TabPanel - Fix active tab switching on focusIn (T852689) (#11583)

* Fix active tab switching on focusIn (T852689)

* Tests for fix T852689

* Small refactoring

* Small fix

* Tests improvements

* Small refactoring

* Test refactorings

* Tests improvements

* fix tests for non jquery enviroment

* Small fix

* Small test refactoring

* Fix test for mobile devices

* Fix focusing for mobile devices

* Fix focusing logic

* Small refactoring

* Small fixes

* Pull request feedback

* Tets fix

* Small refactoring

* Small fix

* Refactoring

* Small tests refactoring

* Small tests refactoring

* Small test refactoring

* Tests refactorings

* Rid of unexpected borders for the DataGrid selected rows in generic light and dark themes (T853231) (#11665)

* Fix mock of window for server side tests (#11681)

* PivotGrid: Fix texts.emptyValue was not working (T852897) (#11671)

* Fix environment preparation for gesture cover tests (#11672)

* Fix environment preparation for gesture cover tests

* refactor

* Comment unstable assert in test (#11688)

* Fix DropDownEditor Popup position depending the "rtlEnabled" option value (T856114) (#11687)

* Fix Popup position of the DropDownEditor depending on "rtlEnabled" option value (T856114)

* refactoring

* Support date serialization formats for DateBox with list picker type (T854579) (#11695)

* DataGrid - Setting the isHighlighted option in the onFocusedCellChanging event handler does not work when the end user uses the Tab key to navigate between data cells (T853599) (#11667)

* Renovation: odata/mixins es6 refactoring (#11444)

* Renovation: Data Source refactoring (#11479)

* DataGrid: Fix onRowClick call on "Save" click when edit mode is "form" (T848729) (#11615)

* DataGrid: Fix onRowClick call on "Save" click when edit mode is "form" (T848729)

* Fix test

* Gantt: fix incorrect key value on assignment deleting (T850951) (#11704)

* UpdateCI - Functional tests - Added testCafe quarantineMode parameter and applied it for the Scheduler (#11640)

* UpdateCI - Functional tests - Added testCafe quarantineMode parameter and applied it for scheduler.

* A bit of refactoring

* A bit of refactoring

* DataGrid - Focused row should not being reseted after begin edit row if form edit mode (T851400) (#11620)

* DataGrid - Contrast Theme - Deleted records are not visible in Batch Editing Mode ( T856115) (#11702)

* Fix recurrence part position and size after daylights saving change (T804886, first step) (#11657)

* dxScheduler - fix recurrent appointment rendering with workWeek view (T853629) (#11660)

* Scheduler, remove skipTimezone checking after T834428 fixing (#11680)

* ExcelJS - changing 'wrapText' setting according grid.wordWrapEnabled option (#11701)

* ExcelJS - changing default value for 'autoFilterEnabled' property to false (#11700)

* Refactor some functions in Scheduler subscribes (#11712)

* Draft (#11715)

* Fix Scheduler tests in Tokyo and Australia timezones (#11722)

* Scheduler - Reduce test speed in unstable functional tests (#11706)

* Fix hiding tooltip by click issue (T850217) (#11720)

* Add missing tests on events for Popup and Overlay (#11719)

* Fix Lookup styles for compact themes (T856794) (#11725)

* Drone CI: colorized logs (#11721)

* Less refactoring for scss generation (icons, typography, button, buttonGroup, scrollView) (#11629)

* File Manager - Directory Chooser dialog text change (#11732)

* Draft

* Next iteration

* Implement dialogManager and add localizations constants

* Remove redundant code

* Fix up test

* Add confirmation dialog draft and move dialog inits to ctor

* Fix uncaught exception when a legend is hidden (T854736) (#11737)

* File Manager - Notification popup configuration (#11741)

* Draft

* Reset text alignment

* Option rename

* DateBox should not raise any errors when useMaskBehavior is enabled and locale digits are different to arabic digits (T851630) (#11678)

* Remove some code for deprecated formatWidthCalculator and closeOnValueChange DateBox options (#11736)

* File Manager - Change icon of filesView 'ParentFolder' item (#11634)

* Icon changed

* Breadcrumbs icon revert and filesView parentFolder icon change

* List (Sortable) - Fix item dragging to the top position when allowReordering is false (T856292) (#11729)

* List (Sortable) - Fix item dragging to the top position when allowReordering is false (T856292)

* Fix lint

* Do not use real clean-css module in some integration tests. (#11749)

* TreeView - fix docs for the rootValue (T854356) (#11718)

* Fix docs for the rootValue of the treeView (T854356)

* Small tests refactoring

* File Manager -  'File actions' button shape (#11746)

* File Manager - Thumbnails View - adjust icons size

* Next version

* Draft

* Revert "Next version"

This reverts commit cd99f05.

* Next one draft

* Buttons and icons now are of default theme size

* Looks like not bad case

* Change focused icon color

* Remove comment

* Revert "File Manager - Thumbnails View - adjust icons size"

This reverts commit 92a82e8.

* Change list icon in dark material theme (T857017) (#11752)

* SelectBox: add some event tests (#11756)

* Renovation: odata/store es6 refactoring (#11391)

* dxPieChart: Fix triggering onLegendClick for legend icon (T854491) (#11760)

* Add missing tests for a DateBox widget (#11733)

* Use bash arrays for Chrome args (docker-ci) (#11764)

* Scss generator (#11750)

* Drone CI - Add time zone argument to the test matrix (#11761)

* Drone CI - Add time zone argument to the test matrix

* Add TZ for Travis, Shippable

* QUnit: Rework API for ignoring uncleared timers (#11765)

* QUnit: Refactor to use one way for ignoring uncleared timers

* QUnit: Get rid of timerIgnoringCheckers.applyUnregister method

* QUnit: timerIgnoringCheckers -> timersDetector.ignoreRules

* QUnit: ignoreRules.needSkip -> ignoreRules.shouldIgnore

* QUnit: Get rid of ignoreAngularBrowserDeferTimer duplication

* QUnit: Refactor isThirdPartyLibraryTimer

* QUnit: Get rid of normalizedTimerInfo

* QUnit: Refactor spyWindowMethods

* QUnit: Consolidate all ignore rules for angular in one place

* QUnit: Log test failure when uncleared timers detected instead of global one

* Less: change icon mixin from 'selector' to 'parametrized' (#11763)

* Update README.txt

Sync with #10897

* Remove advanceCaret DateBox option (#11768)

* Scrollable - check scroll position after update() (T848870) (#11766)

* DataGrid - column headers do not align with cells if showScrollbar is 'always' (#11758)

* Add missing NumberBox test (#11769)

* DataGrid: Fix selected checkboxes were not checked after page refresh if stateStoring is enabled and renderAsync is true (T857205) (#11773)

* Scss generator: additional widgets (#11782)

* Add bundled tests for "onInitialized" and "onDisposing" events (#11762)

* Add bundled tests for "onInitialized" and "onDisposing" events

* add LayoutManager to tests

Co-authored-by: AlekseyMartynov <AlekseyMartynov@users.noreply.github.com>

* Drone CI: reduce dotnet cache footprint  (#11783)

* ExcelJS - set vertical alignment for cell is 'top' as default (#11778)

* Add noClean option for devextreme-themebuilder (#11790) (#11799)

* Gantt: Add time intervals (#11776)

* DataGrid: The onFocusedRowChanged event firing refactoring (#11724)

* Fix passing of the event that caused the value to change when clicking the List item of the DateBox time picker (T858107) (#11800)

* DropDownButton: add some events tests (#11775)

* DropDownButton: add some events tests

* Fix widget behavior

- Possible problems with SSR (depends on specific config) has been resolved
- ContentReady event has been normalized
- OptionChanged issues has been resolver

* add one more test

* remove comma

* fix typo

Co-authored-by: Dmitry Levkovskiy <DokaRus@users.noreply.github.com>

* Diagram redesign (#11812)

* Diagram - UI changes (toolbox) + rename some files

* Fix linter errors

* QUnit: Enable errors for 'qunit/no-ok-equality' rule (#11816)

* Fix "Initialized and Disposing events" tests for IE (#11814)

* HtmlEditor: Ignore Quill timers in tests (#11818)

* Add missing TagBox tests (#11810)

* QUnit: Make extensions compatible with IE (#11843)

* Scss: add new widgets to generator (#11831)

* DataGrid: Fix cell was not highlighted after editing another cell and click (refix T836391) (#11659)

Co-authored-by: AlekseyMartynov <AlekseyMartynov@users.noreply.github.com>

* DOTNET_USE_POLLING_FILE_WATCHER=true (docker-ci) (#11855)

* FileManager - Update result type for file provider's methods (#11853)

* Scss: add new widgets to generator (#11868)

* ThemeBuilder tests refactoring (#11801)

* DataGrid: Fix group cell that has the dx-datagrid-hidden-column class when the hidingPriority property is specified for a grid column (T857506) (#11833)

* DataGrid: Fix group cell that has the dx-datagrid-hidden-column class when the hidingPriority property is specified for a grid column (T857506)

* Fix lint

* Support ScrollView reachBottom event for dropDownLists keyboard navigation if the browser is zoomed (T858013) (#11851)

* dxScheduler - fix appointment popup on closing (T854500) (#11754)

* Fix angular typescript hack (#11884)

* Fix FF test after #11724 (#11876)

* Widgets: Eliminate global object pollution (#11887)

* CollectionWidget: Remove globals in tests

* Tooltip: Do not set 'aria-describedby' to window

* TreeList: Fix values were not assigned by e.promise in onInitNewRow (T857405) (#11794)

* Fix Calendar accessibility issues (#11846)

* Fix Calendar accessibility issues

* Calendar views refactoring

* base view refactoring

* remove code duplication

* Update cache before callBase

* Support zero value as a new selected item key for the DropDownButton (T858013) (#11880)

* DataGrid: Remove globals in tests (#11888)

* FileManager - Add public constructor for FileManagerItem class (#11885)

* TreeList: Add node property for a detail adaptive row (#11871)

* ExcelJS - add doс comments for arguments of the 'exportDataGrid' function (#11807)

* TreeList: Fix navigateTo to the same page with row expanding after #11724 (#11895)

* Don't hang if QUnit runner is broken (docker-ci) (#11897)

* Update docker-ci.sh

Quotes

* Revert "ExcelJS - add doс comments for arguments of the 'exportDataGrid' function (#11807)" (#11898)

* Merge js/events.d.ts into js/events/index.d.ts (#11901)

* DataGrid - KeyboardNavigation - Replace pointerUp with pointerDown (#11900)

* DataGrid - KeyboardNavigation - Replace pointerUp with pointerDown

* Fix fileManager tests

* Fix treeList tests

* Fix tests in FF

* Fix IE test

* FileManager - Update public API (#11905)

* File Manager - UploadPanel items appearance (#11907)

* RadioGroup: add some event tests (#11866)

* TreeList: Fix getSelectedRowsData method when calling navigateToRow in the onNodesInitialized event (T858312) (#11904)

* ExcelJS - add doс comments for arguments of the 'exportDataGrid' function (#11912)

* Diagram - fix server-side rendering test (#11913)

* DataGrid: Fix onFocusedRowChanged firing on scroll if autoNavigateToFocusedRow is false after #11724 (#11910)

* Fix zero-time appointment width in month & timelineMonth views (T858496) (#11860)

* Fix zero-time appointment width in month & timelineMonth views (T858496)

* rename index

* Refactor

* Drone CI - Fix setting timezone (#11906)

* Drone CI - Fix setting timezone

* Drone CI - Correct timezones

* List: Fix incorrect dragged item render if RTL is enabled (T859557) (#11918)

* Fix "event" argument of the Switch "valueChanged" event when value changed by gesture (T860005) (#11922)

* File Manager - ProgressPanel close button alignment (#11926)

* File Manager - ProgressPanel close button alignment

* Now it's more aligned

* Update docker-ci.sh

* run_$TARGET convention (docker-ci)

* Update ja.json (#11879)

* Update ja.json

Added localizations for Max and Min

* Update ja.json

localized dxDataGrid-summaryAvg as well

* FileManager - Update FileSystemProviderBase.getItems() method signature (#11933)

* Update localization.js

Give names to a bunch of <anonymous> tasks

* ExcelJS - rename cellsRange to cellRange (#11936)

* DataGrid: fix column header's sort icon remains after grouping by this column if showWhenGrouped (T859208) (#11914)

* dxLookup - Fix field paddings in the Material theme

* DataGrid - Click by command select cell should not highlight focus if editing is enabled (refix T836391) (#11937)

* CI: QUnit runner watchdog (#11938)

* ExcelJS - change doc comments (#11935)

* Don't build all themes in TEST_CI mode (#11939)

* Update aspnet.tests.js

spy.restore()

* File Manager - ProgressPanel file icons size (#11950)

* FileManager - Progress panel close button alignment (#11951)

* File Manager - ProgressPanel close button alignment

* Now it's more aligned

* File Manager - ProgressPanel close button alignment

* Diagram - redesign (add history toolbar and view toolbar) (#11944)

* Diagram - add history toolbar + viewSettings toolbar - first commit

* Diagram - commands refactoring

* Diagram - add an ability to check context menu items

* Diagram - context menus refactoring

* Diagram - context menu icons fix

* Diagram - fix select box commands

* Diagram - toolbars refactoring + tests

* Fix tests

* Fix tests

* Fix tests

* Fix the knokout binding with the observable array in the Form (#11923) (#11954)

* FileManager - Update CustomFileSystemProviderOptions declarations (#11952)

* FileManager - Update event / callback function signatures (#11953)

* Draggable: fix clone had incorrect direction if rtlEnabled (T859557 refix) (#11928)

* Fix label and bar point overlapping on the edge of pane (T856746) (#11955)

* Fix double min-width rule in the CSS bundle (#11960)

* ASP.NET: warning about the alternate template syntax (#11934)

* Limit DropDownLists popup height if the container is larger than a window (T859133) (#11949)

* FileManager - Add upload.chunkSize option (#11966)

* Fix after merge

Co-authored-by: Konstantin Volnyagin <vconst@users.noreply.github.com>
Co-authored-by: Sergey Novikov <57402891+novsstation@users.noreply.github.com>
Co-authored-by: kotov.alexander <alexander.kotov@devexpress.com>
Co-authored-by: Andrey Ignatovskiy <43685423+LazyLahtak@users.noreply.github.com>
Co-authored-by: Jaan Toming <jtoming@gmail.com>
Co-authored-by: Dmitry Levkovskiy <DokaRus@users.noreply.github.com>
Co-authored-by: Alexey Kamyshin <aurrius.the.badger@gmail.com>
Co-authored-by: Igor Maltsev <igor_malzew@mail.ru>
Co-authored-by: Alyar <Alyar666@users.noreply.github.com>
Co-authored-by: Alexander Zelevinskiy <16476188+zelik88@users.noreply.github.com>
Co-authored-by: Anton Sermyazhko <anton.sermyazhko@devexpress.com>
Co-authored-by: Yana Yarovaya <Yarovaya@users.noreply.github.com>
Co-authored-by: Smirnova Yuliya <Krijovnick@users.noreply.github.com>
Co-authored-by: EugeniyKiyashko <EugeniyKiyashko@users.noreply.github.com>
Co-authored-by: Stanislav Klesarev <klesarevklesarevstas@gmail.com>
Co-authored-by: polosatov.alexander <alexanderPolosatov@users.noreply.github.com>
Co-authored-by: AlekseyMartynov <AlekseyMartynov@users.noreply.github.com>
Co-authored-by: Alexey Babich <alexey.babych@gmail.com>
Co-authored-by: Anton Kuznetsov <ksercs0@gmail.com>
Co-authored-by: Alexander Bezborodov <alexander.bezborodov@devexpress.com>
Co-authored-by: Alexander Ziborov <1420883+San4es@users.noreply.github.com>
Co-authored-by: Stepan <kruglikov.stepan@gmail.com>
Co-authored-by: Roman Rodin <romzay@gmail.com>
Co-authored-by: Vladimir Kovalev <47112293+vladkovl@users.noreply.github.com>
Co-authored-by: ilya.kharchenko <14272298+IlyaKhD@users.noreply.github.com>
Co-authored-by: AlisherAmonulloev <AlisherAmonulloev@users.noreply.github.com>
Co-authored-by: groshenkovamarina <marina.groshenkova@devexpress.com>
Co-authored-by: Dmitry Semenov <jsdmitry@users.noreply.github.com>
Co-authored-by: pavelgruba <pavel.gruba@devexpress.com>
  • Loading branch information
1 parent 8c2b24e commit 7e36c8a
Show file tree
Hide file tree
Showing 468 changed files with 13,567 additions and 8,777 deletions.
11 changes: 9 additions & 2 deletions .drone.yml
Expand Up @@ -17,7 +17,7 @@ pipeline:
build:
image: devexpress/devextreme-build:20_1
environment:
- TRAVIS=true
- TRAVIS=true
commands:
- ./drone-cache.sh restore
- script -qefc ./docker-ci.sh /dev/null
Expand All @@ -31,8 +31,14 @@ matrix:
- { TARGET: test, CONSTEL: misc }
- { TARGET: test, CONSTEL: ui }
- { TARGET: test, CONSTEL: ui.editors }
- { TARGET: test, CONSTEL: ui.editors, TZ: 'PST8PDT' }
- { TARGET: test, CONSTEL: ui.editors, TZ: 'Japan' }
- { TARGET: test, CONSTEL: ui.editors, TZ: 'Australia/ACT' }
- { TARGET: test, CONSTEL: ui.grid }
- { TARGET: test, CONSTEL: ui.scheduler }
- { TARGET: test, CONSTEL: ui.scheduler, TZ: 'PST8PDT' }
- { TARGET: test, CONSTEL: ui.scheduler, TZ: 'Japan' }
- { TARGET: test, CONSTEL: ui.scheduler, TZ: 'Australia/ACT' }
- { TARGET: test, CONSTEL: viz }
- { TARGET: test, PERF: true, JQUERY: true, NO_HEADLESS: true }
- { TARGET: test, MOBILE_UA: ios9, CONSTEL: ui }
Expand All @@ -48,8 +54,9 @@ matrix:
- { TARGET: test, BROWSER: firefox, JQUERY: true, CONSTEL: ui.scheduler }
- { TARGET: test, BROWSER: firefox, JQUERY: true, CONSTEL: viz }
- { TARGET: test_functional, COMPONENT: dataGrid }
- { TARGET: test_functional, COMPONENT: scheduler }
- { TARGET: test_functional, COMPONENT: scheduler, QUARANTINE_MODE: true }
- { TARGET: test_functional, COMPONENT: editors }
- { TARGET: test_functional, COMPONENT: navigation }
- { TARGET: test_themebuilder }
- { TARGET: test_jest }
- { TARGET: test_scss }
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -7,6 +7,7 @@
/js/**/*.p.js
/themebuilder/data/less
/themebuilder/data/metadata
/scss
bin
node_modules
obj
Expand Down
9 changes: 8 additions & 1 deletion .travis.yml
Expand Up @@ -12,8 +12,14 @@ env:
- TARGET=test CONSTEL=misc
- TARGET=test CONSTEL=ui
- TARGET=test CONSTEL=ui.editors
- TARGET=test CONSTEL=ui.editors TZ='PST8PDT'
- TARGET=test CONSTEL=ui.editors TZ='Japan'
- TARGET=test CONSTEL=ui.editors TZ='Australia/ACT'
- TARGET=test CONSTEL=ui.grid
- TARGET=test CONSTEL=ui.scheduler
- TARGET=test CONSTEL=ui.scheduler TZ='PST8PDT'
- TARGET=test CONSTEL=ui.scheduler TZ='Japan'
- TARGET=test CONSTEL=ui.scheduler TZ='Australia/ACT'
- TARGET=test CONSTEL=viz
- TARGET=test PERF=true JQUERY=true NO_HEADLESS=true
- TARGET=test MOBILE_UA=ios9 CONSTEL=ui
Expand All @@ -29,11 +35,12 @@ env:
- TARGET=test BROWSER=firefox JQUERY=true CONSTEL=ui.scheduler
- TARGET=test BROWSER=firefox JQUERY=true CONSTEL=viz
- TARGET=test_functional COMPONENT=dataGrid
- TARGET=test_functional COMPONENT=scheduler
- TARGET=test_functional COMPONENT=scheduler QUARANTINE_MODE=true
- TARGET=test_functional COMPONENT=editors
- TARGET=test_functional COMPONENT=navigation
- TARGET=test_themebuilder
- TARGET=test_jest
- TARGET=test_scss

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion build/docker-image/README.txt
Expand Up @@ -2,7 +2,7 @@ Build:
docker build -t devexpress/devextreme-build:YYYY-MM-DD .

Debug:
docker run --rm -ti -p 5900:5900 -e TARGET=test -v REPO_PATH:/devextreme devexpress/devextreme-build:YYYY-MM-DD ./docker-ci.sh
docker run --rm -ti -p 5900:5900 -e NO_HEADLESS=true -e TARGET=test -v REPO_PATH:/devextreme devexpress/devextreme-build:YYYY-MM-DD ./docker-ci.sh

Move tag:
docker tag devexpress/devextreme-build:YYYY-MM-DD devexpress/devextreme-build:XX_X
Expand Down
18 changes: 10 additions & 8 deletions build/gulp/localization.js
Expand Up @@ -87,8 +87,8 @@ const getMessages = function(directory, locale) {
return serializeObject(json, true);
};

gulp.task('localization-messages', gulp.parallel(getLocales(DICTIONARY_SOURCE_FOLDER).map(locale => {
return function() {
gulp.task('localization-messages', gulp.parallel(getLocales(DICTIONARY_SOURCE_FOLDER).map(locale => Object.assign(
function() {
return gulp
.src('build/gulp/localization-template.jst')
.pipe(template({
Expand All @@ -99,8 +99,9 @@ gulp.task('localization-messages', gulp.parallel(getLocales(DICTIONARY_SOURCE_FO
.pipe(headerPipes.useStrict())
.pipe(headerPipes.bangLicense())
.pipe(gulp.dest(RESULT_PATH));
};
})));
},
{ displayName: 'dx.messages.' + locale }
))));

gulp.task('localization-generated-sources', gulp.parallel([
{
Expand All @@ -124,8 +125,8 @@ gulp.task('localization-generated-sources', gulp.parallel([
destination: 'js/localization/cldr-data'

}
].map((source) => {
return function() {
].map((source) => Object.assign(
function() {
return gulp
.src('build/gulp/generated_js.jst')
.pipe(template({
Expand All @@ -135,7 +136,8 @@ gulp.task('localization-generated-sources', gulp.parallel([
.pipe(lint.format())
.pipe(rename(source.filename))
.pipe(gulp.dest(source.destination));
};
})));
},
{ displayName: source.filename }
))));

gulp.task('localization', gulp.series('localization-messages', 'localization-generated-sources'));
48 changes: 24 additions & 24 deletions build/gulp/modules_metadata.json
Expand Up @@ -177,6 +177,30 @@
"triggerHandler": { "path": "events.triggerHandler" }
}
},
{
"name": "file_management/file_system_item",
"exports": {
"default": { "path": "fileManagement.FileSystemItem" }
}
},
{
"name": "file_management/custom_provider",
"exports": {
"default": { "path": "fileManagement.CustomFileSystemProvider" }
}
},
{
"name": "file_management/object_provider",
"exports": {
"default": { "path": "fileManagement.ObjectFileSystemProvider" }
}
},
{
"name": "file_management/remote_provider",
"exports": {
"default": { "path": "fileManagement.RemoteFileSystemProvider" }
}
},
{
"name": "integration/jquery"
},
Expand Down Expand Up @@ -362,30 +386,6 @@
"default": { "path": "ui.dxFileManager", "isWidget": true }
}
},
{
"name": "ui/file_manager/file_provider/remote",
"exports": {
"default": { "path": "fileProvider.RemoteFileProvider" }
}
},
{
"name": "ui/file_manager/file_provider/custom",
"exports": {
"default": { "path": "fileProvider.CustomFileProvider" }
}
},
{
"name": "ui/file_manager/file_provider/array",
"exports": {
"default": { "path": "fileProvider.ArrayFileProvider" }
}
},
{
"name": "ui/file_manager/file_provider/ajax",
"exports": {
"default": { "path": "fileProvider.AjaxFileProvider" }
}
},
{
"name": "ui/form",
"exports": {
Expand Down
13 changes: 13 additions & 0 deletions build/gulp/scss/compiler.js
@@ -0,0 +1,13 @@
const sass = require('gulp-dart-sass');
const gulp = require('gulp');

const outputPath = require('./config').outputPath;

const compileBundle = (bundleName) => {
return gulp.src(bundleName)
.pipe(sass())
.pipe(gulp.dest('artifacts/scss-css'));
};

gulp.task('sass-material', () => compileBundle(`${outputPath}/bundles/dx.material.blue.light.scss`));
gulp.task('sass-generic', () => compileBundle(`${outputPath}/bundles/dx.light.scss`));
4 changes: 4 additions & 0 deletions build/gulp/scss/config.js
@@ -0,0 +1,4 @@
module.exports = {
outputPath: 'scss',
unfixedScssPath: 'styles'
};

0 comments on commit 7e36c8a

Please sign in to comment.