Skip to content

Commit 8a6835c

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Merge from master.
2 parents fd766ec + fd4b3f2 commit 8a6835c

File tree

314 files changed

+8032
-20601
lines changed

Some content is hidden

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

314 files changed

+8032
-20601
lines changed

.github/workflows/nodejs.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,10 @@ jobs:
3636
run: npm run lint:i18n
3737
- name: Build
3838
run: npm run build:lib
39-
# - name: Test
40-
# run: |
41-
# npm run test:lib
42-
# npm run test:styles
43-
# npm run test:schematics
44-
# npm run test:i18n
4539
- name: Test
4640
run: |
4741
npm run test:lib
42+
npm run test:styles
4843
npm run test:schematics
4944
npm run test:i18n
5045
env:

angular.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
"sourceMap": true,
3838
"optimization": false,
3939
"namedChunks": true,
40-
"aot": false
40+
"aot": false,
41+
"stylePreprocessorOptions": {
42+
"includePaths": ["node_modules"]
43+
}
4144
},
4245
"configurations": {
4346
"production": {

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ steps:
2525
env:
2626
NODE_OPTIONS: "--max_old_space_size=4096"
2727

28-
# - script: npm run test:styles
29-
# displayName: 'Run styling library tests'
28+
- script: npm run test:styles
29+
displayName: 'Run styling library tests'
3030

3131
## Use only Github actions for publishing coveralls.io status
3232
# - script: istanbul-combine -d coverage -p none -r lcov -r cobertura coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json

cypress.config.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { defineConfig } from 'cypress'
2+
3+
export default defineConfig({
4+
videosFolder: 'cypress/videos',
5+
screenshotsFolder: 'cypress/screenshots',
6+
fixturesFolder: 'cypress/fixtures',
7+
e2e: {
8+
// We've imported your old cypress plugins here.
9+
// You may want to clean this up later by importing these.
10+
setupNodeEvents(on, config) {
11+
return require('./cypress/plugins/index.ts')(on, config)
12+
},
13+
baseUrl: 'http://localhost:4200',
14+
},
15+
})

cypress.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

gulpfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ const STYLES = {
2626
DIST: './dist/igniteui-angular/lib/core/styles'
2727
},
2828
CONFIG: {
29-
outputStyle: 'compressed'
29+
outputStyle: 'compressed',
30+
includePaths: ['node_modules']
3031
}
3132
};
3233

0 commit comments

Comments
 (0)