Skip to content

Commit c809634

Browse files
authored
Merge branch 'master' into mtsvyatkova/issue-12056
2 parents a3e2e2b + 7498e03 commit c809634

Some content is hidden

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

44 files changed

+2168
-2673
lines changed

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
node-version: ${{ matrix.node-version }}
2828
cache: 'npm'
2929
- name: Install packages
30-
run: npm install
30+
run: npm ci
3131
- name: Lint Lib
3232
run: npm run lint:lib
3333
env:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ All notable changes for each version of this project will be documented in this
3131
- **Behavioral Change** - When adding new row in grid with enabled batch editing, `rowChangesCount` displays the number of the defined columns.
3232
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
3333
- **Behavioral Change** - When editing a row, `rowChangesCount` and `hiddenColumnsCount`would be displayed.
34+
- **Behavioral Change** - The Grid Paginator component is no longer hidden when there's no data and/or all columns are hidden.
3435

3536
- `IgxExcelExporterService`
3637
- Added support for exporting grid summaries.

angular.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
"namedChunks": true,
4040
"aot": false,
4141
"stylePreprocessorOptions": {
42-
"includePaths": ["node_modules"]
42+
"includePaths": [
43+
"node_modules"
44+
]
4345
}
4446
},
4547
"configurations": {
@@ -283,5 +285,13 @@
283285
},
284286
"cli": {
285287
"analytics": false
288+
},
289+
"schematics": {
290+
"@angular-eslint/schematics:application": {
291+
"setParserOptionsProject": true
292+
},
293+
"@angular-eslint/schematics:library": {
294+
"setParserOptionsProject": true
295+
}
286296
}
287297
}

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ steps:
77
versionSpec: '16.x'
88
displayName: 'Install Node.js'
99

10-
- script: npm install
10+
- script: npm ci
1111
displayName: 'Install dependencies'
1212
env:
1313
AZURE_PIPELINES: "true"

gulpfile.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,10 @@ function typedocBuildDocsEN(cb) {
248248
}
249249

250250
const SASSDOC = {
251-
PROJECT_PATH: path.join(__dirname, 'projects', 'igniteui-angular', 'src', 'lib', 'core', 'styles'),
251+
PROJECT_PATHS: [
252+
`${path.join(__dirname, 'projects', 'igniteui-angular', 'src', 'lib', 'core', 'styles')}/**/*.scss`,
253+
`${path.join(__dirname, 'node_modules', 'igniteui-theming', 'sass')}/**/*.scss`
254+
],
252255
DEST: path.join(DOCS_OUTPUT_PATH, 'sass'),
253256
OPTIONS: path.join(__dirname, '.sassdocrc'),
254257
};
@@ -266,7 +269,7 @@ function sassdocBuildJson(cb) {
266269
options.convert = convert;
267270
options.exportDir = exportDir;
268271

269-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
272+
gulp.src(SASSDOC.PROJECT_PATHS)
270273
.pipe(sassdoc(options));
271274

272275
cb();
@@ -282,7 +285,7 @@ function sassdocImportJson(cb) {
282285
options.json_dir = importDir;
283286
options.shellStringsPath = path.join(__dirname, 'extras', 'template', 'strings', 'shell-strings.json');
284287

285-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
288+
gulp.src(SASSDOC.PROJECT_PATHS)
286289
.pipe(sassdoc(options));
287290

288291
cb();
@@ -297,7 +300,7 @@ function sassdocBuildJA(cb) {
297300
options.json_dir = pathTranslations;
298301
options.shellStringsPath = path.join(__dirname, 'extras', 'template', 'strings', 'shell-strings.json');
299302

300-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
303+
gulp.src(SASSDOC.PROJECT_PATHS)
301304
.pipe(sassdoc(options));
302305

303306
cb();
@@ -309,7 +312,7 @@ function sassdocBuildEN(cb) {
309312
options.lang = 'en';
310313
options.shellStringsPath = path.join(__dirname, 'extras', 'template', 'strings', 'shell-strings.json');
311314

312-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
315+
gulp.src(SASSDOC.PROJECT_PATHS)
313316
.pipe(sassdoc(options));
314317

315318
cb();

0 commit comments

Comments
 (0)